locale/de/locales.pl ausgeführt.

diff --git a/locale/de/all b/locale/de/all
index 442fb7b..5828b1a 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -252,6 +252,7 @@ $self->{texts} = {
   'Belegnummer'                 => 'Buchungsnummer',
   'Beratername'                 => 'Beratername',
   'Beraternummer'               => 'Beraternummer',
+  'Best Before'                 => 'Mindesthaltbarkeit',
   'Bestandskonto'               => 'Bestandskonto',
   'Bilanz'                      => 'Bilanz',
   'Billing Address'             => 'Rechnungsadresse',
@@ -1658,7 +1659,7 @@ $self->{texts} = {
   'There are usually three ways to install Perl modules.' => 'Es gibt normalerweise drei Arten, ein Perlmodul zu installieren.',
   'There is at least one sales or purchase invoice for which Lx-Office recorded an inventory transaction with taxkeys even though no tax was recorded.' => 'Es gibt mindestens eine Einkaufs- oder Verkaufsrechnung, für die Lx-Office einen Steuerschlüssel ungleich 0 verzeichnet hat, obwohl für Warenbestandsbuchugen bei Rechnungen nie Steuern gebucht werden.',
   'There is at least one transaction for which the user has chosen a logically wrong taxkey.' => 'Es gibt mindestens eine Buchung, bei der ein logisch nicht passender Steuerschlüssel ausgewählt wurde.',
-  'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, for the transfer of #5.' => 'Von \'#1\' ist in Lager \'#2\', Lagerplatz \'#3\', #4, nicht genügend eingelagert, um insgesamt #5 auszulagern.',
+  'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, #5, for the transfer of #6.' => 'Von \'#1\' ist in Lager \'#2\', Lagerplatz \'#3\', #4, #5, nicht genügend eingelagert, um insgesamt #6 auszulagern.',
   'There is not enough left of \'#1\' in bin \'#2\' for the removal of #3.' => 'In Lagerplatz \'#2\' ist nicht genug von \'#1\' vorhanden, um #3 zu entnehmen.',
   'There is nothing to do in this step.' => 'In diesem Schritt gibt es nichts mehr zu tun.',
   'Therefore there\'s no need to create the same article more than once if it is sold or bought in/from another tax zone.' => 'Deswegen muss man den gleichen Artikel nicht mehr mehrmals anlegen, wenn er in verschiedenen Steuerzonen gehandelt werden soll.',
@@ -1892,6 +1893,7 @@ $self->{texts} = {
   'bank_transfer_payment_list_#1' => 'ueberweisungs_zahlungsliste_#1',
   'bankaccounts'                => 'Bankkonten',
   'banktransfers'               => 'ueberweisungen',
+  'bestbefore #1'               => 'Mindesthaltbarkeit',
   'bin_list'                    => 'Lagerliste',
   'bis'                         => 'bis',
   'button'                      => '?',
@@ -1952,6 +1954,7 @@ $self->{texts} = {
   'month'                       => 'Monatliche Abgabe',
   'new Window'                  => 'neues Fenster',
   'no'                          => 'nein',
+  'no bestbefore'               => 'keine Mindesthaltbarkeit',
   'no chargenumber'             => 'keine Chargennummer',
   'none (pricegroup)'           => 'keine',
   'not executed'                => 'nicht ausgeführt',

diff --git a/locale/de/do b/locale/de/do
index d23905b..ffdc85c 100644 (file)
--- a/locale/de/do
+++ b/locale/de/do
@@ -262,7 +262,7 @@ $self->{texts} = {
   'The list has been printed.'  => 'Die Liste wurde ausgedruckt.',
   'The parts for this delivery order have already been transferred in.' => 'Die Artikel dieses Lieferscheins wurden bereits eingelagert.',
   'The parts for this delivery order have already been transferred out.' => 'Die Artikel dieses Lieferscheins wurden bereits ausgelagert.',
-  'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, for the transfer of #5.' => 'Von \'#1\' ist in Lager \'#2\', Lagerplatz \'#3\', #4, nicht genügend eingelagert, um insgesamt #5 auszulagern.',
+  'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, #5, for the transfer of #6.' => 'Von \'#1\' ist in Lager \'#2\', Lagerplatz \'#3\', #4, #5, nicht genügend eingelagert, um insgesamt #6 auszulagern.',
   'To (email)'                  => 'An',
   'Transaction description'     => 'Vorgangsbezeichnung',
   'Transactions, AR transactions, AP transactions' => 'Dialogbuchen, Debitorenrechnungen, Kreditorenrechnungen',
@@ -290,6 +290,7 @@ $self->{texts} = {
   'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.' => 'Ihre PostgreSQL-Installation benutzt UTF-8 als Zeichensatz. Sie müssen deshalb Lx-Office so konfigurieren, dass es ebenfalls UTF-8 als Zeichensatz benutzt.',
   'Zipcode'                     => 'PLZ',
   '[email]'                     => '[email]',
+  'bestbefore #1'               => 'Mindesthaltbarkeit',
   'bin_list'                    => 'Lagerliste',
   'chargenumber #1'             => 'Chargennummer #1',
   'config/authentication.pl: Key "DB_config" is missing.' => 'config/authentication.pl: Das Schlüsselwort "DB_config" fehlt.',
@@ -300,6 +301,7 @@ $self->{texts} = {
   'emailed to'                  => 'gemailt an',
   'invoice'                     => 'Rechnung',
   'no'                          => 'nein',
+  'no bestbefore'               => 'keine Mindesthaltbarkeit',
   'no chargenumber'             => 'keine Chargennummer',
   'none (pricegroup)'           => 'keine',
   'packing_list'                => 'Versandliste',

diff --git a/locale/de/login b/locale/de/login
index 3cbd3f0..226668e 100644 (file)
--- a/locale/de/login
+++ b/locale/de/login
@@ -327,7 +327,7 @@ $self->{texts} = {
   'The parts for this delivery order have already been transferred out.' => 'Die Artikel dieses Lieferscheins wurden bereits ausgelagert.',
   'The session is invalid or has expired.' => 'Die Session ist ungültig oder abgelaufen.',
   'The subject is missing.'     => 'Der Betreff fehlt.',
-  'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, for the transfer of #5.' => 'Von \'#1\' ist in Lager \'#2\', Lagerplatz \'#3\', #4, nicht genügend eingelagert, um insgesamt #5 auszulagern.',
+  'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, #5, for the transfer of #6.' => 'Von \'#1\' ist in Lager \'#2\', Lagerplatz \'#3\', #4, #5, nicht genügend eingelagert, um insgesamt #6 auszulagern.',
   'To (email)'                  => 'An',
   'Total'                       => 'Summe',
   'Transaction description'     => 'Vorgangsbezeichnung',
@@ -367,6 +367,7 @@ $self->{texts} = {
   'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.' => 'Ihre PostgreSQL-Installation benutzt UTF-8 als Zeichensatz. Sie müssen deshalb Lx-Office so konfigurieren, dass es ebenfalls UTF-8 als Zeichensatz benutzt.',
   'Zipcode'                     => 'PLZ',
   '[email]'                     => '[email]',
+  'bestbefore #1'               => 'Mindesthaltbarkeit',
   'bin_list'                    => 'Lagerliste',
   'chargenumber #1'             => 'Chargennummer #1',
   'config/authentication.pl: Key "DB_config" is missing.' => 'config/authentication.pl: Das Schlüsselwort "DB_config" fehlt.',
@@ -378,6 +379,7 @@ $self->{texts} = {
   'follow_up_list'              => 'wiedervorlageliste',
   'invoice'                     => 'Rechnung',
   'no'                          => 'nein',
+  'no bestbefore'               => 'keine Mindesthaltbarkeit',
   'no chargenumber'             => 'keine Chargennummer',
   'none (pricegroup)'           => 'keine',
   'oe.pl::search called with unknown type' => 'oe.pl::search mit unbekanntem Typ aufgerufen',

diff --git a/locale/de/oe b/locale/de/oe
index 40f169d..00d5704 100644 (file)
--- a/locale/de/oe
+++ b/locale/de/oe
@@ -300,7 +300,7 @@ $self->{texts} = {
   'The list has been printed.'  => 'Die Liste wurde ausgedruckt.',
   'The parts for this delivery order have already been transferred in.' => 'Die Artikel dieses Lieferscheins wurden bereits eingelagert.',
   'The parts for this delivery order have already been transferred out.' => 'Die Artikel dieses Lieferscheins wurden bereits ausgelagert.',
-  'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, for the transfer of #5.' => 'Von \'#1\' ist in Lager \'#2\', Lagerplatz \'#3\', #4, nicht genügend eingelagert, um insgesamt #5 auszulagern.',
+  'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, #5, for the transfer of #6.' => 'Von \'#1\' ist in Lager \'#2\', Lagerplatz \'#3\', #4, #5, nicht genügend eingelagert, um insgesamt #6 auszulagern.',
   'To (email)'                  => 'An',
   'Total'                       => 'Summe',
   'Transaction description'     => 'Vorgangsbezeichnung',
@@ -336,6 +336,7 @@ $self->{texts} = {
   'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.' => 'Ihre PostgreSQL-Installation benutzt UTF-8 als Zeichensatz. Sie müssen deshalb Lx-Office so konfigurieren, dass es ebenfalls UTF-8 als Zeichensatz benutzt.',
   'Zipcode'                     => 'PLZ',
   '[email]'                     => '[email]',
+  'bestbefore #1'               => 'Mindesthaltbarkeit',
   'bin_list'                    => 'Lagerliste',
   'chargenumber #1'             => 'Chargennummer #1',
   'config/authentication.pl: Key "DB_config" is missing.' => 'config/authentication.pl: Das Schlüsselwort "DB_config" fehlt.',
@@ -346,6 +347,7 @@ $self->{texts} = {
   'emailed to'                  => 'gemailt an',
   'invoice'                     => 'Rechnung',
   'no'                          => 'nein',
+  'no bestbefore'               => 'keine Mindesthaltbarkeit',
   'no chargenumber'             => 'keine Chargennummer',
   'none (pricegroup)'           => 'keine',
   'oe.pl::search called with unknown type' => 'oe.pl::search mit unbekanntem Typ aufgerufen',

diff --git a/locale/de/todo b/locale/de/todo
index 281868b..7187833 100644 (file)
--- a/locale/de/todo
+++ b/locale/de/todo
@@ -323,7 +323,7 @@ $self->{texts} = {
   'The parts for this delivery order have already been transferred in.' => 'Die Artikel dieses Lieferscheins wurden bereits eingelagert.',
   'The parts for this delivery order have already been transferred out.' => 'Die Artikel dieses Lieferscheins wurden bereits ausgelagert.',
   'The subject is missing.'     => 'Der Betreff fehlt.',
-  'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, for the transfer of #5.' => 'Von \'#1\' ist in Lager \'#2\', Lagerplatz \'#3\', #4, nicht genügend eingelagert, um insgesamt #5 auszulagern.',
+  'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, #5, for the transfer of #6.' => 'Von \'#1\' ist in Lager \'#2\', Lagerplatz \'#3\', #4, #5, nicht genügend eingelagert, um insgesamt #6 auszulagern.',
   'To (email)'                  => 'An',
   'Total'                       => 'Summe',
   'Transaction description'     => 'Vorgangsbezeichnung',
@@ -360,6 +360,7 @@ $self->{texts} = {
   'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.' => 'Ihre PostgreSQL-Installation benutzt UTF-8 als Zeichensatz. Sie müssen deshalb Lx-Office so konfigurieren, dass es ebenfalls UTF-8 als Zeichensatz benutzt.',
   'Zipcode'                     => 'PLZ',
   '[email]'                     => '[email]',
+  'bestbefore #1'               => 'Mindesthaltbarkeit',
   'bin_list'                    => 'Lagerliste',
   'chargenumber #1'             => 'Chargennummer #1',
   'config/authentication.pl: Key "DB_config" is missing.' => 'config/authentication.pl: Das Schlüsselwort "DB_config" fehlt.',
@@ -371,6 +372,7 @@ $self->{texts} = {
   'follow_up_list'              => 'wiedervorlageliste',
   'invoice'                     => 'Rechnung',
   'no'                          => 'nein',
+  'no bestbefore'               => 'keine Mindesthaltbarkeit',
   'no chargenumber'             => 'keine Chargennummer',
   'none (pricegroup)'           => 'keine',
   'oe.pl::search called with unknown type' => 'oe.pl::search mit unbekanntem Typ aufgerufen',

diff --git a/locale/de/wh b/locale/de/wh
index 09992ed..0f64a05 100644 (file)
--- a/locale/de/wh
+++ b/locale/de/wh
@@ -12,6 +12,7 @@ $self->{texts} = {
   'All reports'                 => 'Alle Berichte (Kontenübersicht, Summen- u. Saldenliste, GuV, BWA, Bilanz, Projektbuchungen)',
   'Attempt to call an undefined sub named \'%s\'' => 'Es wurde versucht, eine nicht definierte Unterfunktion namens \'%s\' aufzurufen.',
   'Bcc'                         => 'Bcc',
+  'Best Before'                 => 'Mindesthaltbarkeit',
   'Bin'                         => 'Lagerplatz',
   'Bin From'                    => 'Quelllagerplatz',
   'Bin List'                    => 'Lagerliste',

diff --git a/templates/webpages/do/stock_in_form_de.html b/templates/webpages/do/stock_in_form_de.html
index f7b6a68..ecf8b98 100644 (file)
--- a/templates/webpages/do/stock_in_form_de.html
+++ b/templates/webpages/do/stock_in_form_de.html
@@ -92,6 +92,7 @@
      <th class="listheading">Lager</th>
      <th class="listheading">Lagerplatz</th>
      <th class="listheading">Chargennummer</th>
+     <th class="listheading">Mindesthaltbarkeit</th>
      <th align="right" class="listheading">Menge</th>
      <th align="right" class="listheading">Einheit</th>
     </tr>
@@ -105,6 +106,7 @@
      <td>[% HTML.escape(row.warehouse_description) %]</td>
      <td>[% HTML.escape(row.bin_description) %]</td>
      <td>[% HTML.escape(row.chargenumber) %]</td>
+     <td>[% HTML.escape(row.bestbefore) %]</td>
      <td>[% HTML.escape(LxERP.format_amount(row.qty)) %]</td>
      <td>[% HTML.escape(row.unit) %]</td>
 
@@ -120,6 +122,12 @@
 
      <td><select name="bin_id_[% loop.count %]" id="bin_id_[% loop.count %]"></select></td>
      <td><input name="chargenumber_[% loop.count %]" value="[% HTML.escape(row.chargenumber) %]"></td>
+
+     <td>
+       <input name="bestbefore_[% loop.count %]" id="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]" size="11" title="[% myconfig_dateformat %]">
+       <input type="button" name="b_bestbefore_[% loop.count %]" id="bestbefore_trigger_[% loop.count %]" value="?">
+     </td>
+
      <td><input name="qty_[% loop.count %]" size="12" value="[% HTML.escape(LxERP.format_amount(row.qty)) %]"></td>
 
      <td>
@@ -149,6 +157,21 @@
   </p>
  </form>
 
+ [%- IF NOT delivered %]
+  <script type="text/javascript">
+    <!--
+    [%- FOREACH row = STOCK_INFO %]
+    Calendar.setup( {
+      inputField : "bestbefore_[% loop.count %]",
+      ifFormat :"[% myconfig_jsc_dateformat %]",
+      align : "BR",
+      button : "bestbefore_trigger_[% loop.count %]"
+    });
+    [%- END %]
+    //-->
+  </script>
+  [%- END %]
+
 </body>
 </html>
 

diff --git a/templates/webpages/do/stock_out_form_de.html b/templates/webpages/do/stock_out_form_de.html
index 1520083..6812c3e 100644 (file)
--- a/templates/webpages/do/stock_out_form_de.html
+++ b/templates/webpages/do/stock_out_form_de.html
@@ -60,6 +60,7 @@
      <th class="listheading">Lager</th>
      <th class="listheading">Lagerplatz</th>
      <th class="listheading">Chargennummer</th>
+     <th class="listheading">Mindesthaltbarkeit</th>
      [%- UNLESS delivered %]
      <th align="right" class="listheading">Lagerbestand</th>
      [%- END %]
@@ -73,6 +74,7 @@
      <td>[% HTML.escape(row.warehousedescription) %]</td>
      <td>[% HTML.escape(row.bindescription) %]</td>
      <td>[% HTML.escape(row.chargenumber) %]</td>
+     <td>[% HTML.escape(row.bestbefore) %]</td>
 
      [%- IF delivered %]
 
@@ -103,6 +105,7 @@
     <input type="hidden" name="warehouse_id_[% loop.count %]" value="[% HTML.escape(row.warehouse_id) %]">
     <input type="hidden" name="bin_id_[% loop.count %]"       value="[% HTML.escape(row.bin_id) %]">
     <input type="hidden" name="chargenumber_[% loop.count %]" value="[% HTML.escape(row.chargenumber) %]">
+    <input type="hidden" name="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]">
     [%- END %]
    </table>
   </p>

diff --git a/templates/webpages/generic/select_part_de.html b/templates/webpages/generic/select_part_de.html
index 80ab537..771860e 100644 (file)
--- a/templates/webpages/generic/select_part_de.html
+++ b/templates/webpages/generic/select_part_de.html
@@ -20,6 +20,9 @@
      [% IF has_charge %]
      <th class="listheading">Chargennummer</th>
      [% END %]
+     [% IF has_bestbefore %]
+     <th class="listheading">Best Before</th>
+     [% END %]
      [% IF has_ean %]
      <th class="listheading">EAN</th>
      [% END %]
@@ -49,6 +52,13 @@
       [% HTML.escape(part.chargenumber) %]
      </td>
      [% END %]
+     [% IF has_bestbefore %]
+     <td>
+      <input type="hidden" name="new_bestbefore_id_[% loop.count %]" value="[% HTML.escape(part.bestbefore_id) %]">
+      <input type="hidden" name="new_bestbefore_[% loop.count %]" value="[% HTML.escape(part.bestbefore) %]">
+      [% HTML.escape(part.bestbefore) %]
+     </td>
+     [% END %]
      [% IF has_ean %]
      <td>
       <input type="hidden" name="new_ean_[% loop.count %]" value="[% HTML.escape(part.ean) %]">

diff --git a/templates/webpages/wh/journal_filter_de.html b/templates/webpages/wh/journal_filter_de.html
index 2c47654..c49a81d 100644 (file)
--- a/templates/webpages/wh/journal_filter_de.html
+++ b/templates/webpages/wh/journal_filter_de.html
@@ -104,6 +104,13 @@
         <th align="right" nowrap>Chargennummer:</th>
         <td><input name="chargenumber" size=40></td>
        </tr>
+       <tr>
+        <th align="right" nowrap>Mindesthaltbarkeit:</th>
+        <td>
+         <input name="bestbefore" id="bestbefore" size="11" title="[% myconfig_dateformat %]">
+         <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
+        </td>
+       </tr>
        <tr>
         <th align="right" nowrap>Umlagermenge:</th>
         <td>
@@ -159,6 +166,8 @@
         <td nowrap><label for="l_partnumber">Artikelnummer</label></td>
         <td align="right"><input name="l_chargenumber" id="l_chargenumber" class="checkbox" type="checkbox" value="Y" checked></td>
         <td nowrap><label for="l_chargenumber">Chargennummer</label></td>
+        <td align="right"><input name="l_bestbefore" id="l_bestbefore" class="checkbox" type="checkbox" value="Y" checked></td>
+        <td nowrap><label for="l_bestbefore">Mindesthaltbarkeit</label></td>
        </tr>
        <tr>
         <td align="right"><input name="l_trans_id" id="l_trans_id" class="checkbox" type="checkbox" value="Y"></td>
@@ -199,6 +208,13 @@
 
   <script type="text/javascript">
     <!--
+    Calendar.setup( {
+      inputField : "bestbefore",
+      ifFormat :"[% myconfig_jsc_dateformat %]",
+      align : "BR",
+      button : "bestbefore_trigger"
+    });
+
     Calendar.setup( {
       inputField : "fromdate",
       ifFormat :"[% myconfig_jsc_dateformat %]",

diff --git a/templates/webpages/wh/removal_parts_selection_de.html b/templates/webpages/wh/removal_parts_selection_de.html
index f3a21ed..fee3057 100644 (file)
--- a/templates/webpages/wh/removal_parts_selection_de.html
+++ b/templates/webpages/wh/removal_parts_selection_de.html
@@ -34,6 +34,7 @@
      <th class="listheading">Artikelnummer</th>
      <th class="listheading">Artikelbeschreibung</th>
      <th class="listheading">Chargennummer</th>
+     <th class="listheading">Mindesthaltbarkeit</th>
      <th class="listheading">EAN</th>
      <th class="listheading">Lagerbestand</th>
      <th class="listheading">Entnahmemenge</th>
@@ -46,11 +47,13 @@
      <input type="hidden" name="partnumber_[% loop.count %]" value="[% HTML.escape(row.partnumber) %]">
      <input type="hidden" name="partdescription_[% loop.count %]" value="[% HTML.escape(row.partdescription) %]">
      <input type="hidden" name="chargenumber_[% loop.count %]" value="[% HTML.escape(row.chargenumber) %]">
+     <input type="hidden" name="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]">
      <input type="hidden" name="ean_[% loop.count %]" value="[% HTML.escape(row.ean) %]">
      <td>[% HTML.escape(row.bindescription) %]</td>
      <td>[% HTML.escape(row.partnumber) %]</td>
      <td>[% HTML.escape(row.partdescription) %]</td>
      <td>[% HTML.escape(row.chargenumber) %]</td>
+     <td>[% HTML.escape(row.bestbefore) %]</td>
      <td>[% HTML.escape(row.ean) %]</td>
      <td>[% HTML.escape(row.qty) %]</td>
      <td>

diff --git a/templates/webpages/wh/report_filter_de.html b/templates/webpages/wh/report_filter_de.html
index c399e6c..8f0731b 100644 (file)
--- a/templates/webpages/wh/report_filter_de.html
+++ b/templates/webpages/wh/report_filter_de.html
@@ -104,6 +104,13 @@
         <th align="right" nowrap>Chargennummer:</th>
         <td><input name="chargenumber" size=40></td>
        </tr>
+       <tr>
+        <th align="right" nowrap>Mindesthaltbarkeit:</th>
+        <td>
+         <input name="bestbefore" id="bestbefore" size="11" title="[% myconfig_dateformat %]">
+         <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
+        </td>
+       </tr>
        <tr>
         <th align="right" nowrap>Lagerbestand:</th>
         <td>
@@ -147,6 +154,8 @@
         <td nowrap><label for="l_partnumber">Artikelnummer</label></td>
         <td align="right"><input name="l_chargenumber" id="l_chargenumber" class="checkbox" type="checkbox" value="Y" checked></td>
         <td nowrap><label for="l_chargenumber">Chargennummer</label></td>
+        <td align="right"><input name="l_bestbefore" id="l_bestbefore" class="checkbox" type="checkbox" value="Y" checked></td>
+        <td nowrap><label for="l_bestbefore">Mindesthaltbarkeit</label></td>
        </tr>
 
        <tr><td colspan="4"><hr noshade height="1"></td></tr>
@@ -174,5 +183,16 @@
   </p>
  </form>
 
+ <script type="text/javascript">
+   <!--
+     Calendar.setup( {
+     inputField : "bestbefore",
+     ifFormat :"[% myconfig_jsc_dateformat %]",
+     align : "BR",
+     button : "bestbefore_trigger"
+     });
+   //-->
+ </script>
+
 </body>
 </html>

diff --git a/templates/webpages/wh/transfer_parts_selection_de.html b/templates/webpages/wh/transfer_parts_selection_de.html
index 28ba82e..ae381db 100644 (file)
--- a/templates/webpages/wh/transfer_parts_selection_de.html
+++ b/templates/webpages/wh/transfer_parts_selection_de.html
@@ -66,6 +66,7 @@
      <th class="listheading">Artikelnummer</th>
      <th class="listheading">Artikelbeschreibung</th>
      <th class="listheading">Chargennummer</th>
+     <th class="listheading">Mindesthaltbarkeit</th>
      <th class="listheading">EAN</th>
      <th class="listheading">Lagerbestand</th>
      <th class="listheading" colspan="2">Umlagermenge</th>
@@ -79,11 +80,13 @@
      <input type="hidden" name="partnumber_[% loop.count %]" value="[% HTML.escape(row.partnumber) %]">
      <input type="hidden" name="partdescription_[% loop.count %]" value="[% HTML.escape(row.partdescription) %]">
      <input type="hidden" name="chargenumber_[% loop.count %]" value="[% HTML.escape(row.chargenumber) %]">
+     <input type="hidden" name="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]">
      <input type="hidden" name="ean_[% loop.count %]" value="[% HTML.escape(row.ean) %]">
      <td>[% HTML.escape(row.bindescription) %]</td>
      <td>[% HTML.escape(row.partnumber) %]</td>
      <td>[% HTML.escape(row.partdescription) %]</td>
      <td>[% HTML.escape(row.chargenumber) %]</td>
+     <td>[% HTML.escape(row.bestbefore) %]</td>
      <td>[% HTML.escape(row.ean) %]</td>
      <td>[% HTML.escape(row.qty) %]</td>
      <td><input name="qty_[% loop.count %]" size="8" style="text-align: right"></td>

diff --git a/templates/webpages/wh/warehouse_selection_assembly_de.html b/templates/webpages/wh/warehouse_selection_assembly_de.html
index 49bea84..320db99 100644 (file)
--- a/templates/webpages/wh/warehouse_selection_assembly_de.html
+++ b/templates/webpages/wh/warehouse_selection_assembly_de.html
@@ -105,6 +105,14 @@
      <td><input name="chargenumber" size="30" value="[% HTML.escape(chargenumber) %]"></td>
     </tr>
 
+    <tr>
+     <th align="right" nowrap>Mindesthaltbarkeit</th>
+     <td>
+       <input name="bestbefore" id="bestbefore" size="11" value="[% HTML.escape(bestbefore) %]" title="[% myconfig_dateformat %]">
+       <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
+       </td>
+    </tr>
+
     <tr>
      <th align="right" nowrap>Menge</th>
      <td>
@@ -131,5 +139,16 @@
   </p>
  </form>
 
+ <script type="text/javascript">
+   <!--
+     Calendar.setup( {
+     inputField : "bestbefore",
+     ifFormat :"[% myconfig_jsc_dateformat %]",
+     align : "BR",
+     button : "bestbefore_trigger"
+     });
+   //-->
+ </script>
+
 </body>
 </html>

diff --git a/templates/webpages/wh/warehouse_selection_de.html b/templates/webpages/wh/warehouse_selection_de.html
index e5559a5..c8a40e0 100644 (file)
--- a/templates/webpages/wh/warehouse_selection_de.html
+++ b/templates/webpages/wh/warehouse_selection_de.html
@@ -115,6 +115,15 @@
      <th align="right" nowrap>Chargennummer</th>
      <td><input name="chargenumber" size="30"></td>
     </tr>
+
+    <tr>
+     <th align="right" nowrap>Mindesthaltbarkeit</th>
+     <td>
+       <input name="bestbefore" id="bestbefore" size="11" title="[% myconfig_dateformat %]">
+       <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
+     </td>
+    </tr>
+
     <tr>
      <th align="right" nowrap>EAN</th>
      <td><input name="ean" size="30"></td>
@@ -127,5 +136,16 @@
   </p>
  </form>
 
+ <script type="text/javascript">
+   <!--
+     Calendar.setup( {
+     inputField : "bestbefore",
+     ifFormat :"[% myconfig_jsc_dateformat %]",
+     align : "BR",
+     button : "bestbefore_trigger"
+     });
+   //-->
+ </script>
+
 </body>
 </html>

diff --git a/templates/webpages/wh/warehouse_selection_stock_de.html b/templates/webpages/wh/warehouse_selection_stock_de.html
index 9a41c8e..46cd587 100644 (file)
--- a/templates/webpages/wh/warehouse_selection_stock_de.html
+++ b/templates/webpages/wh/warehouse_selection_stock_de.html
@@ -104,6 +104,15 @@
      <th align="right" nowrap>Chargennummer</th>
      <td><input name="chargenumber" size="30" value="[% HTML.escape(chargenumber) %]"></td>
     </tr>
+
+    <tr>
+     <th align="right" nowrap>Mindesthaltbarkeit</th>
+     <td>
+       <input name="bestbefore" id="bestbefore" size="11" value="[% HTML.escape(bestbefore) %]" title="[% myconfig_dateformat %]">
+       <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
+     </td>
+    </tr>
+
     <tr>
      <th align="right" nowrap>EAN</th>
      <td><input name="ean" size="30" value="[% HTML.escape(ean) %]"></td>
@@ -135,5 +144,16 @@
   </p>
  </form>
 
+ <script type="text/javascript">
+   <!--
+     Calendar.setup( {
+     inputField : "bestbefore",
+     ifFormat :"[% myconfig_jsc_dateformat %]",
+     align : "BR",
+     button : "bestbefore_trigger"
+     });
+   //-->
+ </script>
+
 </body>
 </html>