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 c515187cef7696d82ff898d5509d8dd195d25ce8..8aac39dbbc32ff56785f56b564a02b98f0c371d7 100644 (file)
--- 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 fe3a458ff000d6022bcd66a8cfb91e168733a629..2cb27051a498e54b7063825d73f497dc230f97a0 100644 (file)
--- 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 ba6c9cca90da89b2d96cebe88dc6bea954945b2c..0bd60026ed364e14e77a676e447d8efdafc72135 100644 (file)
--- a/templates/webpages/oe/form_header.html
+++ b/templates/webpages/oe/form_header.html
@@ -225,6 +225,8 @@
                     <th align="right" nowrap>
                      [%- IF is_order %]
                       [% 'Order Date' | $T8 %]
+                     [%- ELSIF is_req_quo %]
+                      [% 'RFQ Date' | $T8 %]
                      [%- ELSE %]
                       [% 'Quotation Date' | $T8 %]
                      [%- END %]