X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/3c416dd9b0473132c9b27380f146aed9d2c8d781..87eebe6:/bin/mozilla/oe.pl
diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index beea5ea9f..3dbb113d1 100644
--- 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::DBUtils;
use Data::Dumper;
+use SL::DB::Customer;
+
require "bin/mozilla/io.pl";
require "bin/mozilla/arap.pl";
require "bin/mozilla/reportgenerator.pl";
@@ -435,8 +436,6 @@ sub form_header {
$form->{javascript} .= qq||;
$form->{javascript} .= qq||;
- $::request->layout->use_stylesheet('presenter/record/record_list.css');
-
$form->header;
$TMPL_VAR{HIDDENS} = [ map { name => $_, value => $form->{$_} },
@@ -482,17 +481,9 @@ sub form_footer {
$TMPL_VAR{notes} = qq||;
$TMPL_VAR{intnotes} = qq||;
- 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} && !$form->{taxincluded_changed_by_user} ) {
+ 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}) {