X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=dcdaa3617a042d67ae22d83dd8c99fe7ef4ea90d;hb=4d73998317d83187d5307f686f30c695ecc68c73;hp=608726ff448e4bb1d5bf419f26774795658ef089;hpb=5f0d47eb2561ba03f64b70fbaf7d1d41485d33fe;p=kivitendo-erp.git

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 608726ff4..dcdaa3617 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -202,6 +202,7 @@ sub display_row {
   $serialnumber  = $locale->text('Serial No.');
   $projectnumber = $locale->text('Project');
   $partsgroup    = $locale->text('Group');
+  $reqdate       = $locale->text('Reqdate');
 
   $delvar = 'deliverydate';
 
@@ -396,6 +397,15 @@ sub display_row {
           <b>$projectnumber</b>&nbsp;<input name="projectnumber_$i" size=10 value="$form->{"projectnumber_$i"}">
 		  <input type=hidden name="oldprojectnumber_$i" value="$form->{"oldprojectnumber_$i"}">
 		  <input type=hidden name="project_id_$i" value="$form->{"project_id_$i"}">
+|;
+    if ($form->{type} eq 'invoice' or $form->{type} =~ /order/) {
+      my $reqdate_term = ($form->{type} eq 'invoice')?'deliverydate':'reqdate'; # invoice uses a different term for the same thing.
+      print qq|
+        <b>${$reqdate_term}</b>&nbsp;<input name="${reqdate_term}_$i" size=11 value="$form->{"${reqdate_term}_$i"}">
+|;
+    }
+
+    print qq|
 	  </td>
 	</tr>
 
@@ -431,8 +441,8 @@ sub set_pricegroup {
       $prices = '';
       $price  = 0;
       foreach $item (@{ $form->{PRICES}{$j} }) {
-        $price = $form->round_amount($myconfig,  $item->{price}, 5);
-        $price = $form->format_amount($myconfig, $item->{price}, 2);
+        #$price = $form->round_amount($myconfig,  $item->{price}, 5);
+        #$price = $form->format_amount($myconfig, $item->{price}, 2);
         $price = $item->{price};
         $pricegroup_id = $item->{pricegroup_id};
         $pricegroup    = $item->{pricegroup};
@@ -442,10 +452,10 @@ 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);
+#        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} && ($pricegroup_id != 0)) {
@@ -826,7 +836,7 @@ sub display_form {
     $subroutine = "assembly_row";
   }
   if ($form->{item} eq 'service') {
-    $numrows    = ++$form->{price_rows};
+    $numrows    = $form->{price_rows};
     $subroutine = "price_row";
 
     &{$subroutine}($numrows);
@@ -1606,7 +1616,7 @@ sub print_form {
 
   # some of the stuff could have umlauts so we translate them
   push @a,
-    qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptoemail shippingpoint shipvia company address signature employee contact);
+    qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptoemail shippingpoint shipvia company address signature employee contact department_1 department_2);
 
   push @a, ("${inv}date", "${due}date", email, cc, bcc);