Bugfix für Bug 1127. webpages/ct/get_delivery_master ist nicht customer/vendor sicher...

[mfinanz.git] / bin / mozilla / io.pl

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 69e536c54dde5f984a7afd6673e11e2d323deab6..f8d73005a051150911d6e60c46a30f6f2622f08b 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -197,6 +197,7 @@ sub display_row {
 
   # rows
   for $i (1 .. $numrows) {
+    my %column_data = ();
 
     # undo formatting
     map { $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) } qw(qty discount sellprice price_new price_old) unless ($form->{simple_save});
@@ -261,7 +262,7 @@ sub display_row {
     if ($form->{"id_$i"}) {
       my $ship_qty        = $form->{"ship_$i"} * 1;
       $ship_qty          *= $all_units->{$form->{"partunit_$i"}}->{factor};
-      $ship_qty          /= $all_units->{$form->{"unit_$i"}}->{factor};
+      $ship_qty          /= ( $all_units->{$form->{"unit_$i"}}->{factor} || 1 );
 
       $column_data{ship}  = $form->format_amount(\%myconfig, $form->round_amount($ship_qty, 2) * 1) . ' ' . $form->{"unit_$i"};
     }
@@ -336,6 +337,19 @@ sub display_row {
       if $form->{"id_$i"} && ($form->{type} =~ /^sales_/ ||  $form->{type} =~ /invoice/) && !$is_delivery_order;
 # / marge calculations ending
 
+# calculate onhand
+    if ($form->{"id_$i"}) {
+      my $part         = IC->get_basic_part_info(id => $form->{"id_$i"});
+      my $onhand_color = 'color="#ff0000"' if  $part->{onhand} < $part->{rop};
+      push @ROW2, { value => sprintf "<b>%s</b> <font %s>%s %s</font>",
+                      $locale->text('On Hand'),
+                      $onhand_color,
+                      $form->format_amount(\%myconfig, $part->{onhand}, 2),
+                      $part->{unit}
+      };
+    }
+# / calculate onhand
+
     my @hidden_vars;
 
     if ($is_delivery_order) {