------------------------------------------------------------------------

r7132 | mbunkus | 2008-06-20 10:12:27 +0200 (Fri, 20 Jun 2008) | 1 line

Lieferscheine: Die Entscheidung, ob ein Lieferschein bearbeitet werden darf, wird vom Flag "delivered" abhängig gemacht, nicht von "closed".
------------------------------------------------------------------------

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index 26ebde5..719d65b 100644 (file)
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -789,6 +789,7 @@ sub save_as_new {
 
   $form->{saveasnew} = 1;
   $form->{closed}    = 0;
+  $form->{delivered} = 0;
   map { delete $form->{$_} } qw(printed emailed queued);
 
   # Let Lx-Office assign a new order number if the user hasn't changed the
@@ -939,7 +940,7 @@ sub display_stock_in_form {
   $form->get_lists('warehouses' => { 'key'    => 'WAREHOUSES',
                                      'bins'   => 'BINS' });
 
-  redo_stock_info('stock_info' => $stock_info, 'add_empty_row' => !$form->{closed});
+  redo_stock_info('stock_info' => $stock_info, 'add_empty_row' => !$form->{delivered});
 
   get_basic_bin_wh_info($stock_info);
 
@@ -986,7 +987,7 @@ sub stock_out_form {
 
   my $stock_info = DO->unpack_stock_information('packed' => $form->{stock});
 
-  if (!$form->{closed}) {
+  if (!$form->{delivered}) {
     foreach my $row (@contents) {
       $row->{available_qty} = $form->format_amount_units('amount'      => $row->{qty} * 1,
                                                          'part_unit'   => $part_info->{unit},
@@ -1012,7 +1013,7 @@ sub stock_out_form {
 
   $form->header();
   print $form->parse_html_template('do/stock_out_form', { 'UNITS'      => $units_data,
-                                                          'WHCONTENTS' => $form->{closed} ? $stock_info : \@contents,
+                                                          'WHCONTENTS' => $form->{delivered} ? $stock_info : \@contents,
                                                           'PART_INFO'  => $part_info, });
 
   $lxdebug->leave_sub();
@@ -1056,7 +1057,7 @@ sub set_stock_out {
   $lxdebug->leave_sub();
 }
 
-sub transfer_in_and_close {
+sub transfer_in {
   $lxdebug->enter_sub();
 
   my @part_ids = map { $form->{"id_${_}"} } grep { $form->{"id_${_}"} && $form->{"stock_in_${_}"} } (1 .. $form->{rowcount});
@@ -1093,7 +1094,7 @@ sub transfer_in_and_close {
     }
 
     if (@{ $form->{ERRORS} }) {
-      push @{ $form->{ERRORS} }, $locale->text('The delivery order has not been closed. The warehouse contents have not changed.');
+      push @{ $form->{ERRORS} }, $locale->text('The delivery order has not been marked as delivered. The warehouse contents have not changed.');
 
       update();
       $lxdebug->leave_sub();
@@ -1105,7 +1106,6 @@ sub transfer_in_and_close {
   DO->transfer_in_out('direction' => 'in',
                       'requests'  => \@all_requests);
 
-  $form->{closed}    = 1;
   $form->{delivered} = 1;
 
   save();
@@ -1113,7 +1113,7 @@ sub transfer_in_and_close {
   $lxdebug->leave_sub();
 }
 
-sub transfer_out_and_close {
+sub transfer_out {
   $lxdebug->enter_sub();
 
   my @part_ids = map { $form->{"id_${_}"} } grep { $form->{"id_${_}"} && $form->{"stock_out_${_}"} } (1 .. $form->{rowcount});
@@ -1186,7 +1186,7 @@ sub transfer_out_and_close {
     }
 
     if (@{ $form->{ERRORS} }) {
-      push @{ $form->{ERRORS} }, $locale->text('The delivery order has not been closed. The warehouse contents have not changed.');
+      push @{ $form->{ERRORS} }, $locale->text('The delivery order has not been marked as delivered. The warehouse contents have not changed.');
 
       update();
       $lxdebug->leave_sub();
@@ -1198,7 +1198,6 @@ sub transfer_out_and_close {
   DO->transfer_in_out('direction' => 'out',
                       'requests'  => \@all_requests);
 
-  $form->{closed}    = 1;
   $form->{delivered} = 1;
 
   save();

diff --git a/js/stock_in_out.js b/js/stock_in_out.js
index 2ad4687..5423110 100644 (file)
--- a/js/stock_in_out.js
+++ b/js/stock_in_out.js
@@ -1,23 +1,25 @@
 function open_stock_in_out_window(in_out, row) {
-  var width    = 980;
-  var height   = 600;
-  var parm     = centerParms(width, height) + ",width=" + width + ",height=" + height + ",status=yes,scrollbars=yes";
+  var width     = 980;
+  var height    = 600;
+  var parm      = centerParms(width, height) + ",width=" + width + ",height=" + height + ",status=yes,scrollbars=yes";
 
-  var parts_id = document.getElementsByName("id_" + row)[0].value;
-  var stock    = document.getElementsByName("stock_" + in_out + "_" + row)[0].value;
-  var do_qty   = document.getElementsByName("qty_" + row)[0].value;
-  var do_unit  = document.getElementsByName("unit_" + row)[0].value;
-  var closed   = document.getElementsByName("closed")[0].value;
+  var parts_id  = document.getElementsByName("id_" + row)[0].value;
+  var stock     = document.getElementsByName("stock_" + in_out + "_" + row)[0].value;
+  var do_qty    = document.getElementsByName("qty_" + row)[0].value;
+  var do_unit   = document.getElementsByName("unit_" + row)[0].value;
+  var closed    = document.getElementsByName("closed")[0].value;
+  var delivered = document.getElementsByName("delivered")[0].value;
 
   url = "do.pl?" +
     "action=stock_in_out_form&" +
-    "in_out="   + escape_more(in_out)   + "&" +
-    "row="      + escape_more(row)      + "&" +
-    "parts_id=" + escape_more(parts_id) + "&" +
-    "do_qty="   + escape_more(do_qty)   + "&" +
-    "do_unit="  + escape_more(do_unit)  + "&" +
-    "stock="    + escape_more(stock)    + "&" +
-    "closed="   + escape_more(closed)   + "&" +
+    "in_out="    + escape_more(in_out)    + "&" +
+    "row="       + escape_more(row)       + "&" +
+    "parts_id="  + escape_more(parts_id)  + "&" +
+    "do_qty="    + escape_more(do_qty)    + "&" +
+    "do_unit="   + escape_more(do_unit)   + "&" +
+    "stock="     + escape_more(stock)     + "&" +
+    "closed="    + escape_more(closed)    + "&" +
+    "delivered=" + escape_more(delivered) + "&" +
     "";
   //alert(url);
   window.open(url, "_new_generic", parm);

diff --git a/locale/de/all b/locale/de/all
index 11a2063..d1d0cb3 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1382,7 +1382,7 @@ aktualisieren wollen?',
   'The dataset has to exist before a restoration can be started.' => 'Die Datenbank muss vor der Wiederherstellung bereits angelegt worden sein.',
   'The dataset name is missing.' => 'Der Datenbankname fehlt.',
   'The default value depends on the variable type:' => 'Die Bedeutung des Standardwertes hängt vom Variablentypen ab:',
-  'The delivery order has not been closed. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht abgeschlossen. Die Lagerinhalte wurden nicht verändert.',
+  'The delivery order has not been marked as delivered. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht als geliefert markiert. Der Lagerinhalt wurde nicht verändert.',
   'The description is missing.' => 'Die Beschreibung fehlt.',
   'The description is shown on the form. Chose something short and descriptive.' => 'Die Beschreibung wird in der jeweiligen Maske angezeigt. Sie sollte kurz und prägnant sein.',
   'The directory "%s" could not be created:\n%s' => 'Das Verzeichnis "%s" konnte nicht erstellt werden:\n%s',
@@ -1498,8 +1498,8 @@ aktualisieren wollen?',
   'Transfer Quantity'           => 'Umlagermenge',
   'Transfer To Stock'           => 'Lagereingang',
   'Transfer from warehouse'     => 'Quelllager',
-  'Transfer in and close'       => 'Einlagern und abschließen',
-  'Transfer out and close'      => 'Auslagern und abschließen',
+  'Transfer in'                 => 'Einlagern',
+  'Transfer out'                => 'Auslagern',
   'Transfer qty'                => 'Umlagermenge',
   'Translation (%s)'            => 'Übersetzung (%s)',
   'Trial Balance'               => 'Summen- u. Saldenliste',
@@ -1698,6 +1698,8 @@ aktualisieren wollen?',
   'no'                          => 'nein',
   'no chargenumber'             => 'keine Chargennummer',
   'none (pricegroup)'           => 'keine',
+  'not transferred in yet'      => 'noch nicht eingelagert',
+  'not transferred out yet'     => 'noch nicht ausgelagert',
   'number'                      => 'Nummer',
   'order'                       => 'Reihenfolge',
   'packing_list'                => 'Versandliste',
@@ -1748,6 +1750,8 @@ aktualisieren wollen?',
   'to (date)'                   => 'bis',
   'to (time)'                   => 'bis',
   'transfer'                    => 'Umlagerung',
+  'transferred in'              => 'eingelagert',
+  'transferred out'             => 'ausgelagert',
   'trial_balance'               => 'susa',
   'up'                          => 'hoch',
   'use program settings'        => 'benutze Programmeinstellungen',

diff --git a/locale/de/do b/locale/de/do
index 202d0c3..b8d6e6d 100644 (file)
--- a/locale/de/do
+++ b/locale/de/do
@@ -240,7 +240,7 @@ $self->{texts} = {
   'The connection to the authentication database failed:' => 'Die Verbindung zur Authentifizierungsdatenbank schlug fehl:',
   'The connection to the template database failed:' => 'Die Verbindung zur Vorlagendatenbank schlug fehl:',
   'The creation of the authentication database failed:' => 'Das Anlegen der Authentifizierungsdatenbank schlug fehl:',
-  'The delivery order has not been closed. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht abgeschlossen. Die Lagerinhalte wurden nicht verändert.',
+  'The delivery order has not been marked as delivered. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht als geliefert markiert. Der Lagerinhalt wurde nicht verändert.',
   'The list has been printed.'  => 'Die Liste wurde ausgedruckt.',
   '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.',
   'To (email)'                  => 'An',
@@ -381,8 +381,8 @@ $self->{subs} = {
   'stock_in_form'               => 'stock_in_form',
   'stock_in_out_form'           => 'stock_in_out_form',
   'stock_out_form'              => 'stock_out_form',
-  'transfer_in_and_close'       => 'transfer_in_and_close',
-  'transfer_out_and_close'      => 'transfer_out_and_close',
+  'transfer_in'                 => 'transfer_in',
+  'transfer_out'                => 'transfer_out',
   'update'                      => 'update',
   'update_delivery_order'       => 'update_delivery_order',
   'update_stock_in'             => 'update_stock_in',
@@ -400,8 +400,8 @@ $self->{subs} = {
   'speichern'                   => 'save',
   'als_neu_speichern'           => 'save_as_new',
   'lieferadresse'               => 'ship_to',
-  'einlagern_und_abschließen'   => 'transfer_in_and_close',
-  'auslagern_und_abschließen'   => 'transfer_out_and_close',
+  'einlagern'                   => 'transfer_in',
+  'auslagern'                   => 'transfer_out',
   'erneuern'                    => 'update',
   'ja'                          => 'yes',
 };

diff --git a/locale/de/login b/locale/de/login
index 74c9f31..a30bcba 100644 (file)
--- a/locale/de/login
+++ b/locale/de/login
@@ -304,7 +304,7 @@ $self->{texts} = {
   'The connection to the authentication database failed:' => 'Die Verbindung zur Authentifizierungsdatenbank schlug fehl:',
   'The connection to the template database failed:' => 'Die Verbindung zur Vorlagendatenbank schlug fehl:',
   'The creation of the authentication database failed:' => 'Das Anlegen der Authentifizierungsdatenbank schlug fehl:',
-  'The delivery order has not been closed. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht abgeschlossen. Die Lagerinhalte wurden nicht verändert.',
+  'The delivery order has not been marked as delivered. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht als geliefert markiert. Der Lagerinhalt wurde nicht verändert.',
   'The follow-up date is missing.' => 'Das Wiedervorlagedatum fehlt.',
   'The list has been printed.'  => 'Die Liste wurde ausgedruckt.',
   'The session is invalid or has expired.' => 'Die Session ist ungültig oder abgelaufen.',
@@ -498,8 +498,8 @@ $self->{subs} = {
   'stock_out_form'              => 'stock_out_form',
   'todo_list_follow_ups'        => 'todo_list_follow_ups',
   'todo_list_overdue_sales_quotations' => 'todo_list_overdue_sales_quotations',
-  'transfer_in_and_close'       => 'transfer_in_and_close',
-  'transfer_out_and_close'      => 'transfer_out_and_close',
+  'transfer_in'                 => 'transfer_in',
+  'transfer_out'                => 'transfer_out',
   'update'                      => 'update',
   'update_delivery_order'       => 'update_delivery_order',
   'update_stock_in'             => 'update_stock_in',
@@ -527,8 +527,8 @@ $self->{subs} = {
   'speichern_und_schließen'     => 'save_and_close',
   'als_neu_speichern'           => 'save_as_new',
   'lieferadresse'               => 'ship_to',
-  'einlagern_und_abschließen'   => 'transfer_in_and_close',
-  'auslagern_und_abschließen'   => 'transfer_out_and_close',
+  'einlagern'                   => 'transfer_in',
+  'auslagern'                   => 'transfer_out',
   'erneuern'                    => 'update',
   'ja'                          => 'yes',
 };

diff --git a/locale/de/oe b/locale/de/oe
index aaa2305..73f82a0 100644 (file)
--- a/locale/de/oe
+++ b/locale/de/oe
@@ -279,7 +279,7 @@ $self->{texts} = {
   'The connection to the authentication database failed:' => 'Die Verbindung zur Authentifizierungsdatenbank schlug fehl:',
   'The connection to the template database failed:' => 'Die Verbindung zur Vorlagendatenbank schlug fehl:',
   'The creation of the authentication database failed:' => 'Das Anlegen der Authentifizierungsdatenbank schlug fehl:',
-  'The delivery order has not been closed. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht abgeschlossen. Die Lagerinhalte wurden nicht verändert.',
+  'The delivery order has not been marked as delivered. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht als geliefert markiert. Der Lagerinhalt wurde nicht verändert.',
   'The list has been printed.'  => 'Die Liste wurde ausgedruckt.',
   '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.',
   'To (email)'                  => 'An',
@@ -449,8 +449,8 @@ $self->{subs} = {
   'stock_in_form'               => 'stock_in_form',
   'stock_in_out_form'           => 'stock_in_out_form',
   'stock_out_form'              => 'stock_out_form',
-  'transfer_in_and_close'       => 'transfer_in_and_close',
-  'transfer_out_and_close'      => 'transfer_out_and_close',
+  'transfer_in'                 => 'transfer_in',
+  'transfer_out'                => 'transfer_out',
   'update'                      => 'update',
   'update_delivery_order'       => 'update_delivery_order',
   'update_stock_in'             => 'update_stock_in',
@@ -475,8 +475,8 @@ $self->{subs} = {
   'speichern_und_schließen'     => 'save_and_close',
   'als_neu_speichern'           => 'save_as_new',
   'lieferadresse'               => 'ship_to',
-  'einlagern_und_abschließen'   => 'transfer_in_and_close',
-  'auslagern_und_abschließen'   => 'transfer_out_and_close',
+  'einlagern'                   => 'transfer_in',
+  'auslagern'                   => 'transfer_out',
   'erneuern'                    => 'update',
   'ja'                          => 'yes',
 };

diff --git a/locale/de/todo b/locale/de/todo
index 42dc1d4..e9ac42e 100644 (file)
--- a/locale/de/todo
+++ b/locale/de/todo
@@ -301,7 +301,7 @@ $self->{texts} = {
   'The connection to the authentication database failed:' => 'Die Verbindung zur Authentifizierungsdatenbank schlug fehl:',
   'The connection to the template database failed:' => 'Die Verbindung zur Vorlagendatenbank schlug fehl:',
   'The creation of the authentication database failed:' => 'Das Anlegen der Authentifizierungsdatenbank schlug fehl:',
-  'The delivery order has not been closed. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht abgeschlossen. Die Lagerinhalte wurden nicht verändert.',
+  'The delivery order has not been marked as delivered. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht als geliefert markiert. Der Lagerinhalt wurde nicht verändert.',
   'The follow-up date is missing.' => 'Das Wiedervorlagedatum fehlt.',
   'The list has been printed.'  => 'Die Liste wurde ausgedruckt.',
   'The subject is missing.'     => 'Der Betreff fehlt.',
@@ -486,8 +486,8 @@ $self->{subs} = {
   'stock_out_form'              => 'stock_out_form',
   'todo_list_follow_ups'        => 'todo_list_follow_ups',
   'todo_list_overdue_sales_quotations' => 'todo_list_overdue_sales_quotations',
-  'transfer_in_and_close'       => 'transfer_in_and_close',
-  'transfer_out_and_close'      => 'transfer_out_and_close',
+  'transfer_in'                 => 'transfer_in',
+  'transfer_out'                => 'transfer_out',
   'update'                      => 'update',
   'update_delivery_order'       => 'update_delivery_order',
   'update_stock_in'             => 'update_stock_in',
@@ -514,8 +514,8 @@ $self->{subs} = {
   'speichern_und_schließen'     => 'save_and_close',
   'als_neu_speichern'           => 'save_as_new',
   'lieferadresse'               => 'ship_to',
-  'einlagern_und_abschließen'   => 'transfer_in_and_close',
-  'auslagern_und_abschließen'   => 'transfer_out_and_close',
+  'einlagern'                   => 'transfer_in',
+  'auslagern'                   => 'transfer_out',
   'erneuern'                    => 'update',
   'ja'                          => 'yes',
 };

diff --git a/templates/webpages/do/form_footer_de.html b/templates/webpages/do/form_footer_de.html
index b96f99c..850c8f6 100644 (file)
--- a/templates/webpages/do/form_footer_de.html
+++ b/templates/webpages/do/form_footer_de.html
@@ -3,7 +3,7 @@
 <!--   <p> -->
 <!--    <table> -->
 
- [%- IF closed %]
+ [%- IF delivered %]
  [%- SET RO = ' readonly' %]
  [%- END %]
 
@@ -56,19 +56,19 @@
   <p>
    Lieferschein bearbeiten<br>
    <input class="submit" type="submit" name="action" id="update_button" value="Erneuern">
-   [%- UNLESS closed %]
+   [%- UNLESS delivered %]
    [%- IF vc == 'customer' %]
    <input class="submit" type="submit" name="action" value="Lieferadresse">
    [%- END %]
    [%- END %]
    <input class="submit" type="submit" name="action" value="Drucken">
    <input class="submit" type="submit" name="action" value="eMail">
-   [%- UNLESS closed %]
+   [%- UNLESS delivered %]
    <input class="submit" type="submit" name="action" value="Speichern">
    [%- IF vc == 'customer' %]
-   <input class="submit" type="submit" name="action" value="Auslagern und abschließen">
+   <input class="submit" type="submit" name="action" value="Auslagern">
    [%- ELSE %]
-   <input class="submit" type="submit" name="action" value="Einlagern und abschließen">
+   <input class="submit" type="submit" name="action" value="Einlagern">
    [%- END %]
    [%- END %]
    [%- IF id %]
@@ -80,7 +80,7 @@
   <p>
    Workflow Lieferschein<br>
    <input class="submit" type="submit" name="action" value="als neu speichern">
-   [% UNLESS closed %]
+   [% UNLESS delivered %]
    <input class="submit" type="submit" name="action" value="Löschen">
    [% END %]
    <input class="submit" type="submit" name="action" value="Rechnung">

diff --git a/templates/webpages/do/form_footer_master.html b/templates/webpages/do/form_footer_master.html
index 554a369..cde704c 100644 (file)
--- a/templates/webpages/do/form_footer_master.html
+++ b/templates/webpages/do/form_footer_master.html
@@ -3,7 +3,7 @@
 <!--   <p> -->
 <!--    <table> -->
 
- [%- IF closed %]
+ [%- IF delivered %]
  [%- SET RO = ' readonly' %]
  [%- END %]
 
@@ -56,19 +56,19 @@
   <p>
    <translate>Edit the Delivery Order</translate><br>
    <input class="submit" type="submit" name="action" id="update_button" value="<translate>Update</translate>">
-   [%- UNLESS closed %]
+   [%- UNLESS delivered %]
    [%- IF vc == 'customer' %]
    <input class="submit" type="submit" name="action" value="<translate>Ship to</translate>">
    [%- END %]
    [%- END %]
    <input class="submit" type="submit" name="action" value="<translate>Print</translate>">
    <input class="submit" type="submit" name="action" value="<translate>E-mail</translate>">
-   [%- UNLESS closed %]
+   [%- UNLESS delivered %]
    <input class="submit" type="submit" name="action" value="<translate>Save</translate>">
    [%- IF vc == 'customer' %]
-   <input class="submit" type="submit" name="action" value="<translate>Transfer out and close</translate>">
+   <input class="submit" type="submit" name="action" value="<translate>Transfer out</translate>">
    [%- ELSE %]
-   <input class="submit" type="submit" name="action" value="<translate>Transfer in and close</translate>">
+   <input class="submit" type="submit" name="action" value="<translate>Transfer in</translate>">
    [%- END %]
    [%- END %]
    [%- IF id %]
@@ -80,7 +80,7 @@
   <p>
    <translate>Workflow Delivery Order</translate><br>
    <input class="submit" type="submit" name="action" value="<translate>Save as new</translate>">
-   [% UNLESS closed %]
+   [% UNLESS delivered %]
    <input class="submit" type="submit" name="action" value="<translate>Delete</translate>">
    [% END %]
    <input class="submit" type="submit" name="action" value="<translate>Invoice</translate>">

diff --git a/templates/webpages/do/form_header_de.html b/templates/webpages/do/form_header_de.html
index d8f692f..01983ab 100644 (file)
--- a/templates/webpages/do/form_header_de.html
+++ b/templates/webpages/do/form_header_de.html
@@ -16,7 +16,7 @@
         setupDateFormat('[% myconfig_dateformat %]', 'Falsches Datumsformat!');
         setupPoints('[% myconfig_numberformat %]', 'Falsches Format');
 
-        [%- UNLESS closed %]
+        [%- UNLESS delivered %]
         Calendar.setup({ inputField : "transdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "transdate_trigger" });
         [%- END %]
       }
@@ -42,7 +42,7 @@
  [%- SET the_oldvc = oldvendor %]
  [%- SET is_customer = '0' %]
  [%- END %]
- [%- IF closed %]
+ [%- IF delivered %]
  [%- SET RO = ' readonly' %]
  [%- SET DISABLED = ' disabled' %]
  [%- END %]
@@ -101,7 +101,7 @@
         <input type="hidden" name="old[% vc %]" value="[% HTML.escape(the_oldvc) %]">
         <th align="right">[% IF is_customer %]Kunde[% ELSE %]Lieferant[% END %]</th>
         <td>
-         [%- UNLESS !closed && SHOW_VC_DROP_DOWN %]
+         [%- UNLESS !delivered && SHOW_VC_DROP_DOWN %]
          <input type="text" value="[% HTML.escape(oldvcname) %]" name="[% HTML.escape(vc) %]"[% RO %]>
          [%- ELSE %]
          <select name="[% vc %]" class="fixed_width" onchange="document.do.update_button.click();"[% RO %]>
@@ -118,7 +118,7 @@
         <tr>
          <th align="right">Ansprechpartner</th>
          <td>
-          [%- IF closed %]
+          [%- IF delivered %]
           <input type="hidden" name="cp_id" value="[% HTML.escape(cp_id) %]">
           [%- IF cp_id == row.cp_id %]
           [%- HTML.escape(row.cp_name) %][%- IF row.cp_abteilung %] ([% HTML.escape(row.cp_abteilung) %])[% END -%]
@@ -141,7 +141,7 @@
         <tr>
          <th align="right">Lieferadresse</th>
          <td>
-          [%- IF closed %]
+          [%- IF delivered %]
           <input type="hidden" name="shipto_id" value="[% HTML.escape(shipto_id) %]">
           [%- FOREACH row = ALL_SHIPTO %]
           [%- IF shipto_id == row.shipto_id %]
@@ -191,7 +191,7 @@
        <tr>
         <th align="right" nowrap>Abteilung</th>
         <td colspan="3">
-         [%- IF closed %]
+         [%- IF delivered %]
          <input type="hidden" name="department" value="[% HTML.escape(department) %]">
          [%- FOREACH row = ALL_DEPARTMENTS %]
          [% IF department == row.value %][% HTML.escape(row.description) %]--[% HTML.escape(row.id) %][% END %]
@@ -229,24 +229,36 @@
      <td align="right">
       <table>
 
-       [%- IF vc == 'customer' %]
        <tr>
         <td colspan="2" align="center">
-         <input name="delivered" id="delivered" type="checkbox" class="checkbox" value="1"[% IF delivered %] checked[% END %][% DISABLED %]>
-         <label for="delivered">Geliefert</label>
+         [%- IF delivered %]
+          [%- IF is_customer %]
+          ausgelagert
+          [%- ELSE %]
+          eingelagert
+          [%- END %]
+         [%- ELSE %]
+          [%- IF is_customer %]
+          noch nicht ausgelagert
+          [%- ELSE %]
+          noch nicht eingelagert
+          [%- END %]
+         [%- END %]
+         ;
          [%- IF closed %]
-         <input type="hidden" name="delivered" value="1">
+          Geschlossen
+         [%- ELSE %]
+          Offen
          [%- END %]
         </td>
        </tr>
-       [%- ELSE %]
+
        <input type="hidden" name="delivered" value="[% HTML.escape(delivered) %]">
-       [%- END %]
 
        <tr>
         <th align="right">Bearbeiter</th>
         <td>
-         [%- IF closed %]
+         [%- IF delivered %]
          <input type="hidden" name="employee_id" value="[% HTML.escape(employee_id) %]">
          [%- FOREACH row = ALL_EMPLOYEES %]
          [% IF row.id == employee_id %][%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %][% END %]
@@ -272,7 +284,7 @@
        <tr>
         <th align="right">Verkäufer/in</th>
         <td>
-         [%- IF closed %]
+         [%- IF delivered %]
          <input type="hidden" name="salesman_id" value="[% HTML.escape(salesman_id) %]">
          [%- FOREACH row = ALL_SALESMEN %]
          [% IF row.id == the_salesman_id %][%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %][% END %]
@@ -310,14 +322,14 @@
         <td nowrap>
          <input name="transdate" id="transdate" size="11" title="[% HTML.escape(myconfig_dateformat) %]" value="[% HTML.escape(transdate) %]"
                 onBlur="check_right_date_format(this)"[% RO %]>
-         [% UNLESS closed %]<input type="button" name="b_transdate" id="transdate_trigger" value="?">[% END %]
+         [% UNLESS delivered %]<input type="button" name="b_transdate" id="transdate_trigger" value="?">[% END %]
         </td>
        </tr>
 
        <tr>
         <th width="70%" align="right" nowrap>Projektnummer</th>
         <td>
-         [%- IF closed %]
+         [%- IF delivered %]
          <input type="hidden" name="globalproject_id" value="[% HTML.escape(globalproject_id) %]">
          [%- FOREACH row = ALL_PROJECTS %]
          [% IF globalproject_id == row.id %][% HTML.escape(row.projectnumber) %][% END %]

diff --git a/templates/webpages/do/form_header_master.html b/templates/webpages/do/form_header_master.html
index a881a9c..7b0bfcb 100644 (file)
--- a/templates/webpages/do/form_header_master.html
+++ b/templates/webpages/do/form_header_master.html
@@ -16,7 +16,7 @@
         setupDateFormat('[% myconfig_dateformat %]', '<translate>Falsches Datumsformat!</translate>');
         setupPoints('[% myconfig_numberformat %]', '<translate>wrongformat</translate>');
 
-        [%- UNLESS closed %]
+        [%- UNLESS delivered %]
         Calendar.setup({ inputField : "transdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "transdate_trigger" });
         [%- END %]
       }
@@ -42,7 +42,7 @@
  [%- SET the_oldvc = oldvendor %]
  [%- SET is_customer = '0' %]
  [%- END %]
- [%- IF closed %]
+ [%- IF delivered %]
  [%- SET RO = ' readonly' %]
  [%- SET DISABLED = ' disabled' %]
  [%- END %]
@@ -101,7 +101,7 @@
         <input type="hidden" name="old[% vc %]" value="[% HTML.escape(the_oldvc) %]">
         <th align="right">[% IF is_customer %]<translate>Customer</translate>[% ELSE %]<translate>Vendor</translate>[% END %]</th>
         <td>
-         [%- UNLESS !closed && SHOW_VC_DROP_DOWN %]
+         [%- UNLESS !delivered && SHOW_VC_DROP_DOWN %]
          <input type="text" value="[% HTML.escape(oldvcname) %]" name="[% HTML.escape(vc) %]"[% RO %]>
          [%- ELSE %]
          <select name="[% vc %]" class="fixed_width" onchange="document.do.update_button.click();"[% RO %]>
@@ -118,7 +118,7 @@
         <tr>
          <th align="right"><translate>Contact Person</translate></th>
          <td>
-          [%- IF closed %]
+          [%- IF delivered %]
           <input type="hidden" name="cp_id" value="[% HTML.escape(cp_id) %]">
           [%- IF cp_id == row.cp_id %]
           [%- HTML.escape(row.cp_name) %][%- IF row.cp_abteilung %] ([% HTML.escape(row.cp_abteilung) %])[% END -%]
@@ -141,7 +141,7 @@
         <tr>
          <th align="right"><translate>Shipping Address</translate></th>
          <td>
-          [%- IF closed %]
+          [%- IF delivered %]
           <input type="hidden" name="shipto_id" value="[% HTML.escape(shipto_id) %]">
           [%- FOREACH row = ALL_SHIPTO %]
           [%- IF shipto_id == row.shipto_id %]
@@ -191,7 +191,7 @@
        <tr>
         <th align="right" nowrap><translate>Department</translate></th>
         <td colspan="3">
-         [%- IF closed %]
+         [%- IF delivered %]
          <input type="hidden" name="department" value="[% HTML.escape(department) %]">
          [%- FOREACH row = ALL_DEPARTMENTS %]
          [% IF department == row.value %][% HTML.escape(row.description) %]--[% HTML.escape(row.id) %][% END %]
@@ -229,24 +229,36 @@
      <td align="right">
       <table>
 
-       [%- IF vc == 'customer' %]
        <tr>
         <td colspan="2" align="center">
-         <input name="delivered" id="delivered" type="checkbox" class="checkbox" value="1"[% IF delivered %] checked[% END %][% DISABLED %]>
-         <label for="delivered"><translate>Delivered</translate></label>
+         [%- IF delivered %]
+          [%- IF is_customer %]
+          <translate>transferred out</translate>
+          [%- ELSE %]
+          <translate>transferred in</translate>
+          [%- END %]
+         [%- ELSE %]
+          [%- IF is_customer %]
+          <translate>not transferred out yet</translate>
+          [%- ELSE %]
+          <translate>not transferred in yet</translate>
+          [%- END %]
+         [%- END %]
+         ;
          [%- IF closed %]
-         <input type="hidden" name="delivered" value="1">
+          <translate>Closed</translate>
+         [%- ELSE %]
+          <translate>Open</translate>
          [%- END %]
         </td>
        </tr>
-       [%- ELSE %]
+
        <input type="hidden" name="delivered" value="[% HTML.escape(delivered) %]">
-       [%- END %]
 
        <tr>
         <th align="right"><translate>Employee</translate></th>
         <td>
-         [%- IF closed %]
+         [%- IF delivered %]
          <input type="hidden" name="employee_id" value="[% HTML.escape(employee_id) %]">
          [%- FOREACH row = ALL_EMPLOYEES %]
          [% IF row.id == employee_id %][%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %][% END %]
@@ -272,7 +284,7 @@
        <tr>
         <th align="right"><translate>Salesman</translate></th>
         <td>
-         [%- IF closed %]
+         [%- IF delivered %]
          <input type="hidden" name="salesman_id" value="[% HTML.escape(salesman_id) %]">
          [%- FOREACH row = ALL_SALESMEN %]
          [% IF row.id == the_salesman_id %][%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %][% END %]
@@ -310,14 +322,14 @@
         <td nowrap>
          <input name="transdate" id="transdate" size="11" title="[% HTML.escape(myconfig_dateformat) %]" value="[% HTML.escape(transdate) %]"
                 onBlur="check_right_date_format(this)"[% RO %]>
-         [% UNLESS closed %]<input type="button" name="b_transdate" id="transdate_trigger" value="?">[% END %]
+         [% UNLESS delivered %]<input type="button" name="b_transdate" id="transdate_trigger" value="?">[% END %]
         </td>
        </tr>
 
        <tr>
         <th width="70%" align="right" nowrap><translate>Project Number</translate></th>
         <td>
-         [%- IF closed %]
+         [%- IF delivered %]
          <input type="hidden" name="globalproject_id" value="[% HTML.escape(globalproject_id) %]">
          [%- FOREACH row = ALL_PROJECTS %]
          [% IF globalproject_id == row.id %][% HTML.escape(row.projectnumber) %][% END %]

diff --git a/templates/webpages/do/stock_in_form_de.html b/templates/webpages/do/stock_in_form_de.html
index 8845b7b..f7b6a68 100644 (file)
--- a/templates/webpages/do/stock_in_form_de.html
+++ b/templates/webpages/do/stock_in_form_de.html
@@ -1,6 +1,6 @@
-[% USE HTML %][% USE LxERP %][% USE JavaScript %]<body[% UNLESS closed %] onload="on_load();"[% END %]>
+[% USE HTML %][% USE LxERP %][% USE JavaScript %]<body[% UNLESS delivered %] onload="on_load();"[% END %]>
 
- [%- UNLESS closed %]
+ [%- UNLESS delivered %]
  <script type="text/javascript">
   <!--
       warehouses = new Array();
@@ -100,7 +100,7 @@
     <tr [% IF row.stock_error %] class="tr_error"[% ELSE %]class="listrow[% loop.count % 2 %]"[% END %]>
      <td>[% loop.count %]</td>
 
-     [%- IF closed %]
+     [%- IF delivered %]
 
      <td>[% HTML.escape(row.warehouse_description) %]</td>
      <td>[% HTML.escape(row.bin_description) %]</td>
@@ -140,7 +140,7 @@
   <hr size="3" noshade>
 
   <p>
-   [%- IF closed %]
+   [%- IF delivered %]
    <button type="button" class="submit" name="action" onclick="window.close()">Fenster Schlie&szlig;en</button>
    [%- ELSE %]
    <input class="submit" type="submit" name="action" value="Erneuern">

diff --git a/templates/webpages/do/stock_in_form_master.html b/templates/webpages/do/stock_in_form_master.html
index 8233a7d..42208f2 100644 (file)
--- a/templates/webpages/do/stock_in_form_master.html
+++ b/templates/webpages/do/stock_in_form_master.html
@@ -1,6 +1,6 @@
-[% USE HTML %][% USE LxERP %][% USE JavaScript %]<body[% UNLESS closed %] onload="on_load();"[% END %]>
+[% USE HTML %][% USE LxERP %][% USE JavaScript %]<body[% UNLESS delivered %] onload="on_load();"[% END %]>
 
- [%- UNLESS closed %]
+ [%- UNLESS delivered %]
  <script type="text/javascript">
   <!--
       warehouses = new Array();
@@ -100,7 +100,7 @@
     <tr [% IF row.stock_error %] class="tr_error"[% ELSE %]class="listrow[% loop.count % 2 %]"[% END %]>
      <td>[% loop.count %]</td>
 
-     [%- IF closed %]
+     [%- IF delivered %]
 
      <td>[% HTML.escape(row.warehouse_description) %]</td>
      <td>[% HTML.escape(row.bin_description) %]</td>
@@ -140,7 +140,7 @@
   <hr size="3" noshade>
 
   <p>
-   [%- IF closed %]
+   [%- IF delivered %]
    <button type="button" class="submit" name="action" onclick="window.close()"><translate>Close Window</translate></button>
    [%- ELSE %]
    <input class="submit" type="submit" name="action" value="<translate>Update</translate>">

diff --git a/templates/webpages/do/stock_out_form_de.html b/templates/webpages/do/stock_out_form_de.html
index 1ea34e9..c71d2ff 100644 (file)
--- a/templates/webpages/do/stock_out_form_de.html
+++ b/templates/webpages/do/stock_out_form_de.html
@@ -1,6 +1,6 @@
 [% USE HTML %][% USE LxERP %]<body>
 
- [%- IF closed %]
+ [%- IF delivered %]
  [%- SET RO = ' readonly' %]
  [%- END %]
 
@@ -42,15 +42,16 @@
 
   [%- ELSE %]
 
-  <input type="hidden" name="nextsub"  value="set_stock_out">
-  <input type="hidden" name="rowcount" value="[% HTML.escape(WHCONTENTS.size) %]">
-  <input type="hidden" name="in_out"   value="out">
-  <input type="hidden" name="parts_id" value="[% HTML.escape(parts_id) %]">
-  <input type="hidden" name="partunit" value="[% HTML.escape(PART_INFO.unit) %]">
-  <input type="hidden" name="do_qty"   value="[% HTML.escape(do_qty) %]">
-  <input type="hidden" name="do_unit"  value="[% HTML.escape(do_unit) %]">
-  <input type="hidden" name="row"      value="[% HTML.escape(row) %]">
-  <input type="hidden" name="closed"   value="[% HTML.escape(closed) %]">
+  <input type="hidden" name="nextsub"   value="set_stock_out">
+  <input type="hidden" name="rowcount"  value="[% HTML.escape(WHCONTENTS.size) %]">
+  <input type="hidden" name="in_out"    value="out">
+  <input type="hidden" name="parts_id"  value="[% HTML.escape(parts_id) %]">
+  <input type="hidden" name="partunit"  value="[% HTML.escape(PART_INFO.unit) %]">
+  <input type="hidden" name="do_qty"    value="[% HTML.escape(do_qty) %]">
+  <input type="hidden" name="do_unit"   value="[% HTML.escape(do_unit) %]">
+  <input type="hidden" name="row"       value="[% HTML.escape(row) %]">
+  <input type="hidden" name="closed"    value="[% HTML.escape(closed) %]">
+  <input type="hidden" name="delivered" value="[% HTML.escape(delivered) %]">
 
   <p>
    <table>
@@ -59,7 +60,7 @@
      <th class="listheading">Lager</th>
      <th class="listheading">Lagerplatz</th>
      <th class="listheading">Chargennummer</th>
-     [%- UNLESS closed %]
+     [%- UNLESS delivered %]
      <th align="right" class="listheading">Lagerbestand</th>
      [%- END %]
      <th align="right" class="listheading">Menge</th>
@@ -73,7 +74,7 @@
      <td>[% HTML.escape(row.bindescription) %]</td>
      <td>[% HTML.escape(row.chargenumber) %]</td>
 
-     [%- IF closed %]
+     [%- IF delivered %]
 
      <td>[% HTML.escape(LxERP.format_amount(row.stock_qty)) %]</td>
      <td>[% HTML.escape(row.stock_unit) %]</td>
@@ -104,7 +105,7 @@
   <hr size="3" noshade>
 
   <p>
-   [%- IF closed %]
+   [%- IF delivered %]
    <button type="button" class="submit" name="action" onclick="window.close()">Fenster Schlie&szlig;en</button>
    [%- ELSE %]
    <input class="submit" type="submit" name="action" value="Weiter">

diff --git a/templates/webpages/do/stock_out_form_master.html b/templates/webpages/do/stock_out_form_master.html
index 15d2394..3a13b87 100644 (file)
--- a/templates/webpages/do/stock_out_form_master.html
+++ b/templates/webpages/do/stock_out_form_master.html
@@ -1,6 +1,6 @@
 [% USE HTML %][% USE LxERP %]<body>
 
- [%- IF closed %]
+ [%- IF delivered %]
  [%- SET RO = ' readonly' %]
  [%- END %]
 
@@ -42,15 +42,16 @@
 
   [%- ELSE %]
 
-  <input type="hidden" name="nextsub"  value="set_stock_out">
-  <input type="hidden" name="rowcount" value="[% HTML.escape(WHCONTENTS.size) %]">
-  <input type="hidden" name="in_out"   value="out">
-  <input type="hidden" name="parts_id" value="[% HTML.escape(parts_id) %]">
-  <input type="hidden" name="partunit" value="[% HTML.escape(PART_INFO.unit) %]">
-  <input type="hidden" name="do_qty"   value="[% HTML.escape(do_qty) %]">
-  <input type="hidden" name="do_unit"  value="[% HTML.escape(do_unit) %]">
-  <input type="hidden" name="row"      value="[% HTML.escape(row) %]">
-  <input type="hidden" name="closed"   value="[% HTML.escape(closed) %]">
+  <input type="hidden" name="nextsub"   value="set_stock_out">
+  <input type="hidden" name="rowcount"  value="[% HTML.escape(WHCONTENTS.size) %]">
+  <input type="hidden" name="in_out"    value="out">
+  <input type="hidden" name="parts_id"  value="[% HTML.escape(parts_id) %]">
+  <input type="hidden" name="partunit"  value="[% HTML.escape(PART_INFO.unit) %]">
+  <input type="hidden" name="do_qty"    value="[% HTML.escape(do_qty) %]">
+  <input type="hidden" name="do_unit"   value="[% HTML.escape(do_unit) %]">
+  <input type="hidden" name="row"       value="[% HTML.escape(row) %]">
+  <input type="hidden" name="closed"    value="[% HTML.escape(closed) %]">
+  <input type="hidden" name="delivered" value="[% HTML.escape(delivered) %]">
 
   <p>
    <table>
@@ -59,7 +60,7 @@
      <th class="listheading"><translate>Warehouse</translate></th>
      <th class="listheading"><translate>Bin</translate></th>
      <th class="listheading"><translate>Charge Number</translate></th>
-     [%- UNLESS closed %]
+     [%- UNLESS delivered %]
      <th align="right" class="listheading"><translate>Available qty</translate></th>
      [%- END %]
      <th align="right" class="listheading"><translate>Qty</translate></th>
@@ -73,7 +74,7 @@
      <td>[% HTML.escape(row.bindescription) %]</td>
      <td>[% HTML.escape(row.chargenumber) %]</td>
 
-     [%- IF closed %]
+     [%- IF delivered %]
 
      <td>[% HTML.escape(LxERP.format_amount(row.stock_qty)) %]</td>
      <td>[% HTML.escape(row.stock_unit) %]</td>
@@ -104,7 +105,7 @@
   <hr size="3" noshade>
 
   <p>
-   [%- IF closed %]
+   [%- IF delivered %]
    <button type="button" class="submit" name="action" onclick="window.close()"><translate>Close Window</translate></button>
    [%- ELSE %]
    <input class="submit" type="submit" name="action" value="<translate>Continue</translate>">