From: Philip Reetz <p.reetz@linet-services.de>
Date: Wed, 14 May 2008 12:58:13 +0000 (+0000)
Subject: Lieferdatum pro Zeile wurde nach Umstellung auf Template in Rechnungen nicht mehr... 
X-Git-Tag: release-2.6.0beta1~152
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=e411fd61f5174cd315a083226bb5e2e071a2caf4;p=kivitendo-erp.git

Lieferdatum pro Zeile wurde nach Umstellung auf Template in Rechnungen nicht mehr angezeigt
---

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 9d290c739..eb9ca0f62 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -289,7 +289,7 @@ sub display_row {
     push @ROW2, { value => qq|<b>$projectnumber</b> | . NTI($cgi->popup_menu('-name'  => "project_id_$i",        '-values'  => \@projectnumber_values,
                                                                              '-labels' => \%projectnumber_labels, '-default' => $form->{"project_id_$i"})) };
     push @ROW2, { value => qq|<b>$reqdate</b> <input name="reqdate_$i" size="11" onBlur="check_right_date_format(this)" value="$form->{"reqdate_$i"}">| }
-      if $form->{type} =~ /order/;
+      if ($form->{type} =~ /order/ ||  $form->{type} =~ /invoice/);
     push @ROW2, { value => sprintf qq|<b>%s</b>&nbsp;<input type="checkbox" name="subtotal_$i" value="1" %s>|, 
                    $locale->text('Subtotal'), $form->{"subtotal_$i"} ? 'checked' : '' };
 
@@ -319,7 +319,7 @@ sub display_row {
                    $marge_color, $locale->text('Ertrag'),$form->{"marge_absolut_$i"}, $form->{"marge_percent_$i"},
                    $locale->text('LP'), $form->format_amount(\%myconfig, $form->{"listprice_$i"}, 2),
                    $locale->text('EK'), $form->format_amount(\%myconfig, $form->{"lastcost_$i"}, 2) }
-      if $form->{"id_$i"} && $form->{type} =~ /^sales_/ && !$is_delivery_order;
+      if $form->{"id_$i"} && ($form->{type} =~ /^sales_/ ||  $form->{type} =~ /invoice/) && !$is_delivery_order;
 # / marge calculations ending
 
     my @hidden_vars;