From: Thomas Kasulke <t.kasulke@linet-services.de>
Date: Tue, 3 Apr 2007 11:43:18 +0000 (+0000)
Subject: Nettobeträge bei taxincluded auf Druckvorschau angepasst (Bug 576)
X-Git-Tag: release-2.4.3^2~539
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=02aab73f3ea8e0b8c87ecd5642b9366d7c0f1a50;p=kivitendo-erp.git

Nettobeträge bei taxincluded auf Druckvorschau angepasst (Bug 576)
---

diff --git a/SL/IS.pm b/SL/IS.pm
index cd90a8578..6971f9f48 100644
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -382,8 +382,12 @@ sub invoice_details {
       $form->{paid} += $form->parse_amount($myconfig, $form->{"paid_$i"});
     }
   }
-
-  $form->{subtotal} = $form->format_amount($myconfig, $form->{total}, 2);
+  if($form->{taxincluded}) {
+    $form->{subtotal} = $form->format_amount($myconfig, $form->{total} - $tax, 2);
+  }
+  else {
+    $form->{subtotal} = $form->format_amount($myconfig, $form->{total}, 2);
+  }
   $yesdiscount = $form->{nodiscount_total} - $nodiscount;
   $form->{nodiscount_subtotal} = $form->format_amount($myconfig, $form->{nodiscount_total}, 2);
   $form->{discount_total} = $form->format_amount($myconfig, $form->{discount_total}, 2);