From e411fd61f5174cd315a083226bb5e2e071a2caf4 Mon Sep 17 00:00:00 2001 From: Philip Reetz Date: Wed, 14 May 2008 12:58:13 +0000 Subject: [PATCH] Lieferdatum pro Zeile wurde nach Umstellung auf Template in Rechnungen nicht mehr angezeigt --- bin/mozilla/io.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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|$projectnumber | . NTI($cgi->popup_menu('-name' => "project_id_$i", '-values' => \@projectnumber_values, '-labels' => \%projectnumber_labels, '-default' => $form->{"project_id_$i"})) }; push @ROW2, { value => qq|$reqdate | } - if $form->{type} =~ /order/; + if ($form->{type} =~ /order/ || $form->{type} =~ /invoice/); push @ROW2, { value => sprintf qq|%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; -- 2.20.1