IS::get_customer nicht mehr zum Lader der Einstellung für taxincluded verwenden

fixt #2015

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 2f6f6204e4c843e5e5413067f837951eee452047..0245a15984e2d582cb7294680f20168bcd43e1de 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -37,6 +37,7 @@ use SL::PE;
 use SL::OE;
 use SL::DB::Default;
 use Data::Dumper;
 use SL::OE;
 use SL::DB::Default;
 use Data::Dumper;

+use SL::DBUtils;

 use List::Util qw(max sum);
 
 require "bin/mozilla/io.pl";
 use List::Util qw(max sum);
 
 require "bin/mozilla/io.pl";


@@ -407,14 +408,19 @@ sub form_footer {
 
   # tax, total and subtotal calculations
   my ($tax, $subtotal);
 
   # tax, total and subtotal calculations
   my ($tax, $subtotal);

-  $form->{taxaccounts_array} = [ split / /, $form->{taxaccounts} ];
-
-  my $paymet_id = $::form->{payment_id};
-  IS->get_customer(\%myconfig, \%$form) if $form->{type} =~ /sales_(order|quotation)/;
-  $::form->{payment_id} = $paymet_id;
-
-  if ( $form->{vc} eq 'customer' && !$form->{taxincluded_changed_by_user} ) {
-    $form->{taxincluded} = defined($form->{taxincluded_checked}) ? $form->{taxincluded_checked} : $myconfig{taxincluded_checked};
+  $form->{taxaccounts_array} = [ split(/ /, $form->{taxaccounts}) ];
+
+  if ( $form->{type} =~ /sales_(order|quotation)/ && $form->{vc} eq 'customer' && !$form->{taxincluded_changed_by_user} ) {
+    my $query = '
+      SELECT
+        taxincluded_checked
+      FROM
+        customer
+      WHERE
+        id = ?';
+    my $res = selectfirst_hashref_query($::form, $::form->get_standard_dbh(), $query, conv_i($::form->{customer_id}));
+
+    $form->{taxincluded} = ($res && defined($res->{taxincluded_checked})) ? $res->{taxincluded_checked} : $myconfig{taxincluded_checked};

   }
 
   foreach my $item (@{ $form->{taxaccounts_array} }) {
   }
 
   foreach my $item (@{ $form->{taxaccounts_array} }) {

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index f7f337561fcb672398165aabb6711ff808d1ba8a..beea5ea9f232e434af32e70fbedbe1b6ddeaf13f 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -45,6 +45,7 @@ use SL::PE;
 use SL::ReportGenerator;
 use List::MoreUtils qw(any none);
 use List::Util qw(min max reduce sum);
 use SL::ReportGenerator;
 use List::MoreUtils qw(any none);
 use List::Util qw(min max reduce sum);

+use SL::DBUtils;

 use Data::Dumper;
 
 require "bin/mozilla/io.pl";
 use Data::Dumper;
 
 require "bin/mozilla/io.pl";


@@ -481,12 +482,17 @@ sub form_footer {
   $TMPL_VAR{notes}    = qq|<textarea name=notes rows="$rows" cols="25">| . H($form->{notes}) . qq|</textarea>|;
   $TMPL_VAR{intnotes} = qq|<textarea name=intnotes rows="$introws" cols="35">| . H($form->{intnotes}) . qq|</textarea>|;
 
   $TMPL_VAR{notes}    = qq|<textarea name=notes rows="$rows" cols="25">| . H($form->{notes}) . qq|</textarea>|;
   $TMPL_VAR{intnotes} = qq|<textarea name=intnotes rows="$introws" cols="35">| . H($form->{intnotes}) . qq|</textarea>|;
 

-  my $paymet_id = $::form->{payment_id};
-  IS->get_customer(\%myconfig, $::form) if $form->{type} =~ /sales_(order|quotation)/;
-  $::form->{payment_id} = $paymet_id;
-
-  if ( $form->{vc} eq 'customer' && !$form->{taxincluded_changed_by_user} ) {
-    $form->{taxincluded} = defined($form->{taxincluded_checked}) ? $form->{taxincluded_checked} : $myconfig{taxincluded_checked};
+  if ( $form->{type} =~ /sales_(order|quotation)/ && $form->{vc} eq 'customer' && !$form->{taxincluded_changed_by_user} ) {
+    my $query = '
+      SELECT
+        taxincluded_checked
+      FROM
+        customer
+      WHERE
+        id = ?';
+    my $res = selectfirst_hashref_query($::form, $::form->get_standard_dbh(), $query, conv_i($::form->{customer_id}));
+
+    $form->{taxincluded} = ($res && defined($res->{taxincluded_checked})) ? $res->{taxincluded_checked} : $myconfig{taxincluded_checked};

   }
 
   if (!$form->{taxincluded}) {
   }
 
   if (!$form->{taxincluded}) {