From: Jan Büren <jan@lx-office-hosting.de>
Date: Wed, 3 Mar 2010 11:12:55 +0000 (+0100)
Subject: Fehlerbehebung für Bug 1017, die Anmerkung von Sven war korrekt, die Umformatierung... 
X-Git-Tag: release-2.6.1beta1~50
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=20e6c6695eb9b9742686b947b4037636c31b13dd;p=kivitendo-erp.git

Fehlerbehebung für Bug 1017, die Anmerkung von Sven war korrekt, die Umformatierung muss vor prepare_order gemacht werden
---

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index da09648ca..e6ec1f943 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -1777,14 +1777,17 @@ sub poso {
 
   map { $form->{$_} = $saved_vars{$_} } keys %saved_vars;
 
-  &prepare_order;
-
   # prepare_order assumes that the discount is in db-notation (0.05) and not user-notation (5)
-  # and therefore multiplies the values by 100 in the case of reading from db or making an order from several quotation, so we convert this back into percent-notation for the user interface by multiplying with 0.01
+  # and therefore multiplies the values by 100 in the case of reading from db or making an order
+  # from several quotation, so we convert this back into percent-notation for the user interface by multiplying with 0.01
+  # ergänzung 03.10.2010 muss vor prepare_order passieren (s.a. Svens Kommentar zu Bug 1017)
+  # das parse_amount wird oben schon ausgeführt, deswegen an dieser stelle raus (wichtig: kommawerte bei discount testen)
   for my $i (1 .. $form->{rowcount}) {
-    $form->{"discount_$i"}  = $form->format_amount(\%myconfig, $form->{"discount_$i"} * 0.01);
+    $form->{"discount_$i"} /=100;
   };
 
+  &prepare_order;
+
   # format amounts
   for my $i (1 .. $form->{rowcount} - 1) {
     map { $form->{"${_}_$i"} =~ s/\"/&quot;/g } qw(partnumber description unit);