Preisfaktoren in Erzeugnissen auch im globalen Verkaufspreis richtig übernehmen.

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

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 3700ec60ecf14aaefa4e0296674e6d28c1083c8d..18d2f4f2838a24970153730c1c5542ef03bea1fe 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -145,7 +145,7 @@ sub display_row {
     {  id => 'projectnr',     width => 10,    value => $locale->text('Project'),              display => 0, },
     {  id => 'sellprice',     width => 15,    value => $locale->text('Price'),                display => !$is_delivery_order, },
     {  id => 'sellprice_pg',  width => 8,    value => $locale->text('Pricegroup'),           display => ($form->{type} =~ /^sales_/) && !$is_delivery_order,  },
-    {  id => 'discount',      width => 5,     value => $locale->text('Discount'),             display => ($form->{vc} eq 'customer') && !$is_delivery_order, },
+    {  id => 'discount',      width => 5,     value => $locale->text('Discount'),             display => !$is_delivery_order, },
     {  id => 'linetotal',     width => 10,    value => $locale->text('Extended'),             display => !$is_delivery_order, },
     {  id => 'bin',           width => 10,    value => $locale->text('Bin'),                  display => 0, },
     {  id => 'stock_in_out',  width => 10,    value => $stock_in_out_title,                   display => $is_delivery_order, },
@@ -290,11 +290,6 @@ sub display_row {
     $column_data{bin}         = $form->{"bin_$i"};
 
     if ($is_delivery_order) {
-      # $column_data{stock_in_out} =  $form->{"inventory_accno_$i"} ? calculate_stock_in_out($i) : ' ';
-      # $main::lxdebug->dump(0, "debug", $form->{"inventory_accno_$i"});
-      # meine debug-analyse war negativ (s.o.) - die variable war weder bei dienstleistung, erzeugnis noch ware gefüllt.
-      # bitte korrigieren, falls ich hier falsch liege. jb 19.3.2009
-
       $column_data{stock_in_out} =  calculate_stock_in_out($i);
     }
 
@@ -684,7 +679,7 @@ sub check_form {
                 not_discountable shop ve gv buchungsgruppen_id language_values
                 sellprice_pg pricegroup_old price_old price_new unit_old ordnumber
                 transdate longdescription basefactor marge_total marge_percent
-                marge_price_factor lastcost price_factor_id
+                marge_price_factor lastcost price_factor_id partnotes
                 stock_out stock_in);
 
   # remove any makes or model rows
@@ -713,8 +708,8 @@ sub check_form {
 
         #($form->{"sellprice_$i"},$form->{"$pricegroup_old_$i"}) = split /--/, $form->{"sellprice_$i"};
 
-        $form->{sellprice} += ($form->{"qty_$i"} * $form->{"sellprice_$i"});
-        $form->{weight}    += ($form->{"qty_$i"} * $form->{"weight_$i"});
+        $form->{sellprice} += ($form->{"qty_$i"} * $form->{"sellprice_$i"} / ($form->{"price_factor_$i"} || 1));
+        $form->{weight}    += ($form->{"qty_$i"} * $form->{"weight_$i"} / ($form->{"price_factor_$i"} || 1));
         $count++;
       }
     }