Merge von 735,736 aus unstable: Bugfix

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

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index c704209442f29333b4c389144a18d7fef5a06e6b..dcdaa3617a042d67ae22d83dd8c99fe7ef4ea90d 100644 (file)
--- 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');
   $serialnumber  = $locale->text('Serial No.');
   $projectnumber = $locale->text('Project');
   $partsgroup    = $locale->text('Group');

+  $reqdate       = $locale->text('Reqdate');

 
   $delvar = 'deliverydate';
 
 
   $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"}">
           <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>
 
          </td>
        </tr>