Bugfix Rabattberechnung: Berechnung so umgestellt, dass der Rabatt von der Zeilensumm...

[kivitendo-erp.git] / bin / mozilla / io.pl

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index de350c51345f7f3d711ea72af12225eefd85e36a..6091a94680e685e870c533e7c505e0682caf4b3a 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -33,11 +33,13 @@
 #
 #######################################################################
 
+use CGI;
+use CGI::Ajax;
+use List::Util qw(max);
+
 use SL::Common;
 use SL::CT;
 use SL::IC;
-use CGI::Ajax;
-use CGI;
 
 require "bin/mozilla/common.pl";
 
@@ -297,19 +299,14 @@ sub display_row {
         $form->{"unit_old_$i"} = $form->{"selected_unit_$i"};
       }
     }
+
     ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/);
-    $dec           = length $dec;
-    $decimalplaces = ($dec > 2) ? $dec : 2;
-
-    $discount =
-      $form->round_amount(
-                        $form->{"sellprice_$i"} * $form->{"discount_$i"} / 100,
-                        $decimalplaces);
-
-    $linetotal =
-      $form->round_amount($form->{"sellprice_$i"} - $discount, $decimalplaces);
-    $linetotal = $form->round_amount($linetotal * $form->{"qty_$i"}, 2);
-    my $real_sellprice = $form->{"sellprice_$i"} - $discount;
+    $decimalplaces = max length($dec), 2;
+
+    $discount  = (100 - $form->{"discount_$i"} * 1) / 100;
+    $linetotal = $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"} * $discount, $decimalplaces);
+
+    my $real_sellprice = $form->{"sellprice_$i"} * $discount;
 
     # marge calculations
     my ($marge_font_start, $marge_font_end);