Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 61dd13f4

Von Tamino Steinert vor 3 Tagen hinzugefügt

FIX: 'Steuer im Preis inbegiffen' VK-Rechnungen korrekten Wert anzeigen

Unterschiede anzeigen:

bin/mozilla/is.pl
645 645

  
646 646
  $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
647 647

  
648
  if( $form->{customer_id} && !$form->{taxincluded_changed_by_user} ) {
649
    my $customer = SL::DB::Customer->load_cached($form->{customer_id});
650
    $form->{taxincluded} = defined($customer->taxincluded_checked) ? $customer->taxincluded_checked : $myconfig{taxincluded_checked};
651
  }
652
  $TMPL_VAR{taxincluded} = $form->{taxincluded};
653

  
648 654
  $form->get_lists("taxzones"      => ($form->{id} ? "ALL_TAXZONES" : "ALL_ACTIVE_TAXZONES"),
649 655
                   "currencies"    => "ALL_CURRENCIES",
650 656
                   "price_factors" => "ALL_PRICE_FACTORS");
......
784 790
  my ($tax, $subtotal);
785 791
  $form->{taxaccounts_array} = [ split(/ /, $form->{taxaccounts}) ];
786 792

  
787
  if( $form->{customer_id} && !$form->{taxincluded_changed_by_user} ) {
788
    my $customer = SL::DB::Customer->load_cached($form->{customer_id});
789
    $form->{taxincluded} = defined($customer->taxincluded_checked) ? $customer->taxincluded_checked : $myconfig{taxincluded_checked};
790
  }
791

  
792 793
  foreach my $item (@{ $form->{taxaccounts_array} }) {
793 794
    if ($form->{"${item}_base"}) {
794 795
      if ($form->{taxincluded}) {
......
915 916
  my ($recursive_call) = @_;
916 917

  
917 918
  $form->{print_and_post} = 0         if $form->{second_run};
918
  my $taxincluded         = $form->{taxincluded} ? "checked" : '';
919 919
  $form->{update} = 1;
920 920

  
921 921
  if (($form->{previous_customer_id} || $form->{customer_id}) != $form->{customer_id}) {
......
925 925
    $::form->{billing_address_id} = $::form->{default_billing_address_id};
926 926
  }
927 927

  
928
  $form->{taxincluded} ||= $taxincluded;
929

  
930 928
  $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
931 929
  if ($form->{defaultcurrency} ne $form->{currency}) {
932 930
    if ($form->{exchangerate}) { # user input OR first default ->  leave this value

Auch abrufbar als: Unified diff