From: Sven Donath Date: Thu, 21 Oct 2010 00:47:48 +0000 (+0200) Subject: Merge branch 'master' of ssh://git-sdonath@lx-office.linet-services.de/~/lx-office-erp X-Git-Tag: release-2.6.2beta1~92^2~7 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=f521b94b94cbd7364006304546fc54c6815a48e2;hp=e3f07619ecd412a3c6244bd78398d3c50d32923e;p=kivitendo-erp.git Merge branch 'master' of ssh://git-sdonath@lx-office.linet-services.de/~/lx-office-erp --- diff --git a/SL/Template/LaTeX.pm b/SL/Template/LaTeX.pm index c515187ce..8aac39dbb 100644 --- a/SL/Template/LaTeX.pm +++ b/SL/Template/LaTeX.pm @@ -55,7 +55,7 @@ sub parse_foreach { for (my $i = 0; $i < scalar(@{$ary}); $i++) { # do magic markers - $form->{"__first__"} = $i == 1; + $form->{"__first__"} = $i == 0; $form->{"__last__"} = ($i + 1) == scalar(@{$ary}); $form->{"__odd__"} = (($i + 1) % 2) == 1; $form->{"__counter__"} = $i + 1; diff --git a/locale/de/all b/locale/de/all index fe3a458ff..2cb27051a 100644 --- a/locale/de/all +++ b/locale/de/all @@ -1305,6 +1305,7 @@ $self->{texts} = { 'Quote chararacter' => 'Anführungszeichen', 'Quoted' => 'Angeboten', 'RFQ' => 'Anfrage', + 'RFQ Date' => 'Anfragedatum', 'RFQ Number' => 'Anfragenummer', 'RFQs' => 'Preisanfragen', 'ROP' => 'Mindestlagerbestand', diff --git a/templates/webpages/oe/form_header.html b/templates/webpages/oe/form_header.html index ba6c9cca9..0bd60026e 100644 --- a/templates/webpages/oe/form_header.html +++ b/templates/webpages/oe/form_header.html @@ -225,6 +225,8 @@ [%- IF is_order %] [% 'Order Date' | $T8 %] + [%- ELSIF is_req_quo %] + [% 'RFQ Date' | $T8 %] [%- ELSE %] [% 'Quotation Date' | $T8 %] [%- END %]