taxincluded von Rose laden lassen

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 0245a15984e2d582cb7294680f20168bcd43e1de..8546cb6658e1880dc165f4c022d54ec9dc9af967 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -35,11 +35,12 @@ use SL::FU;
 use SL::IS;
 use SL::PE;
 use SL::OE;
 use SL::IS;
 use SL::PE;
 use SL::OE;

-use SL::DB::Default;

 use Data::Dumper;
 use Data::Dumper;

-use SL::DBUtils;

 use List::Util qw(max sum);
 
 use List::Util qw(max sum);
 

+use SL::DB::Default;
+use SL::DB::Customer;
+

 require "bin/mozilla/io.pl";
 require "bin/mozilla/invoice_io.pl";
 require "bin/mozilla/arap.pl";
 require "bin/mozilla/io.pl";
 require "bin/mozilla/invoice_io.pl";
 require "bin/mozilla/arap.pl";


@@ -410,17 +411,9 @@ sub form_footer {
   my ($tax, $subtotal);
   $form->{taxaccounts_array} = [ split(/ /, $form->{taxaccounts}) ];
 
   my ($tax, $subtotal);
   $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};
+  if ($form->{customer_id}) {
+    my $customer = SL::DB::Customer->new(id => $form->{customer_id})->load();
+    $form->{taxincluded} = defined($customer->taxincluded_checked) ? $customer->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 beea5ea9f232e434af32e70fbedbe1b6ddeaf13f..cfdb11aa021166b7897ed479ae5d4b8ee4b6d349 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -45,9 +45,10 @@ 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;
 
 use Data::Dumper;
 

+use SL::DB::Customer;
+

 require "bin/mozilla/io.pl";
 require "bin/mozilla/arap.pl";
 require "bin/mozilla/reportgenerator.pl";
 require "bin/mozilla/io.pl";
 require "bin/mozilla/arap.pl";
 require "bin/mozilla/reportgenerator.pl";


@@ -482,17 +483,9 @@ 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>|;
 

-  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->{customer_id}) {
+    my $customer = SL::DB::Customer->new(id => $form->{customer_id})->load();
+    $form->{taxincluded} = defined($customer->taxincluded_checked) ? $customer->taxincluded_checked : $myconfig{taxincluded_checked};

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