From: Thomas Heck <theck@linet-services.de>
Date: Mon, 18 Mar 2013 16:56:53 +0000 (+0100)
Subject: "Steuer im Preis inbegriffen" nicht mehr beim Erneuern überschreiben.
X-Git-Tag: release-3.1.0beta1~508
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=2174b7ba062594ce95f9ddf5cb079673e13c3c15;p=kivitendo-erp.git

"Steuer im Preis inbegriffen" nicht mehr beim Erneuern überschreiben.

fixt #2219
---

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 8546cb665..d7e99b76d 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -411,7 +411,7 @@ sub form_footer {
   my ($tax, $subtotal);
   $form->{taxaccounts_array} = [ split(/ /, $form->{taxaccounts}) ];
 
-  if ($form->{customer_id}) {
+  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};
   }
diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index cfdb11aa0..298d3326f 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -483,7 +483,7 @@ 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>|;
 
-  if ($form->{customer_id}) {
+  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};
   }