X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fio.pl;h=608726ff448e4bb1d5bf419f26774795658ef089;hb=cd32c5e983a98a515c0049422db858f2c13c4d7a;hp=c0ab3dc9a6c29efe254bef943337517b51483145;hpb=e44cbe168d7cdaedc952a23102d8c834bd3a2993;p=kivitendo-erp.git

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index c0ab3dc9a..608726ff4 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -254,13 +254,13 @@ sub display_row {
         qq|<td><input name="description_$i" size=30 value="$form->{"description_$i"}"></td>|;
     }
 
-    (my $qty_dec)     = ($form->{"qty_$i"} =~ /\.(\d+)/);
-    $qty_dec          = length $qty_dec;
+    (my $qty_dec) = ($form->{"qty_$i"} =~ /\.(\d+)/);
+    $qty_dec = length $qty_dec;
 
     $column_data{qty} =
-        qq|<td align=right><input name="qty_$i" size=5 value=|.
-          $form->format_amount(\%myconfig, $form->{"qty_$i"}, $qty_dec)
-       .qq|></td>|;
+        qq|<td align=right><input name="qty_$i" size=5 value=|
+      . $form->format_amount(\%myconfig, $form->{"qty_$i"}, $qty_dec)
+      . qq|></td>|;
     $column_data{ship} =
         qq|<td align=right><input name="ship_$i" size=5 value=|
       . $form->format_amount(\%myconfig, $form->{"ship_$i"})
@@ -357,6 +357,9 @@ sub display_row {
 <input type=hidden name="listprice_$i" value="$form->{"listprice_$i"}">
 <input type=hidden name="assembly_$i" value="$form->{"assembly_$i"}">
 <input type=hidden name="taxaccounts_$i" value="$form->{"taxaccounts_$i"}">
+<input type=hidden name="ordnumber_$i" value="$form->{"ordnumber_$i"}">
+<input type=hidden name="transdate_$i" value="$form->{"transdate_$i"}">
+<input type=hidden name="cusordnumber_$i" value="$form->{"cusordnumber_$i"}">
 
 |;
 
@@ -422,7 +425,6 @@ sub set_pricegroup {
   my $rowcount = shift;
   $lxdebug->enter_sub();
   for $j (1 .. $rowcount) {
-
     my $pricegroup_old = $form->{"pricegroup_old_$i"};
     if ($form->{PRICES}{$j}) {
       $len    = 0;
@@ -440,21 +442,26 @@ sub set_pricegroup {
           qq|<option value="$price--$pricegroup_id"$item->{selected}>$pricegroup</option>\n|;
 
         $len += 1;
+        map {
+              $form->{"${_}_$j"} =
+              $form->format_amount(\%myconfig, $form->{"${_}_$j"})
+             } qw(sellprice price_new price_old);
 
         # set new selectedpricegroup_id and prices for "Preis"
-        if ($item->{selected}) {
+        if ($item->{selected} && ($pricegroup_id != 0)) {
           $form->{"pricegroup_old_$j"} = $pricegroup_id;
           $form->{"price_new_$j"}      = $price;
           $form->{"sellprice_$j"}      = $price;
         }
-        if ($len >= 1) {
+        if ($pricegroup_id == 0) {
+          $form->{"price_new_$j"} = $form->{"sellprice_$j"};
+        }
+        if ($len > 1) {
           $form->{"prices_$j"} = $prices;
         }
       }
     }
   }
-
-  #print (STDERR "HIER", Dumper($prices) );
   $lxdebug->leave_sub();
 }
 
@@ -1544,7 +1551,8 @@ sub print_form {
     push @a,
       ("partnumber_$i", "description_$i",
        "partsgroup_$i", "serialnumber_$i",
-       "bin_$i",        "unit_$i");
+       "bin_$i",        "unit_$i",
+       "transdate_$i",  "ordnumber_$i");
   }
   map { push @a, "${_}_description" } split / /, $form->{taxaccounts};