Vorlage fuer Lieferscheine auf dispatcher Mechanismus umgestellt

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index 23989b3..6a8b94b 100644 (file)
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -1232,3 +1232,14 @@ sub no {
 sub update {
   call_sub($form->{update_nextsub} || $form->{nextsub} || 'update_delivery_order');
 }
+
+sub dispatcher {
+  foreach my $action (qw(update ship_to print e_mail save transfer_out transfer_in mark_closed save_as_new invoice delete)) {
+    if ($form->{"action_${action}"}) {
+      call_sub($action);
+      return;
+    }
+  }
+
+  $form->error($locale->text('No action defined.'));
+}

diff --git a/locale/de/acctranscorrections b/locale/de/acctranscorrections
index cc8af02..41a4ccc 100644 (file)
--- a/locale/de/acctranscorrections
+++ b/locale/de/acctranscorrections
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 
 $self->{texts} = {
+  'A temporary file could not be created. Please verify that the directory "#1" is writeable by the webserver.' => 'Eine temporäre Datei konnte nicht angelegt werden. Bitte stellen Sie sicher, dass das Verzeichnis "#1" vom Webserver beschrieben werden darf.',
   'ADDED'                       => 'Hinzugefügt',
   'AP'                          => 'Einkauf',
   'AP Transaction'              => 'Kreditorenbuchung',
@@ -15,6 +16,21 @@ $self->{texts} = {
   'Bin List'                    => 'Lagerliste',
   'Binding to the LDAP server as "#1" failed. Please check config/authentication.pl.' => 'Die Anmeldung am LDAP-Server als "#1" schlug fehl. Bitte überprüfen Sie die Angaben in config/authentication.pl.',
   'CANCELED'                    => 'Storniert',
+  'CR'                          => 'H',
+  'CRM admin'                   => 'Administration',
+  'CRM create customers, vendors and contacts' => 'Erfassen (Kunden, Lieferanten, Personen)',
+  'CRM follow up'               => 'Wiedervorlage',
+  'CRM know how'                => 'Wissens DB',
+  'CRM notices'                 => 'Notizen',
+  'CRM opportunity'             => 'Auftragschance',
+  'CRM optional software'       => 'CRM optionale Software',
+  'CRM other'                   => 'alles Andere',
+  'CRM search'                  => 'Adresssuche',
+  'CRM send email'              => 'eMail',
+  'CRM services'                => 'Dienstleistung',
+  'CRM status'                  => 'Admin Stautus',
+  'CRM termin'                  => 'Termine',
+  'CRM user'                    => 'Admin Benutzer',
   'Cc'                          => 'Cc',
   'Change Lx-Office installation settings (all menu entries beneath \'System\')' => 'Verändern der Lx-Office-Installationseinstellungen (Menüpunkte unterhalb von \'System\')',
   'Confirmation'                => 'Auftragsbestätigung',
@@ -36,6 +52,7 @@ $self->{texts} = {
   'Customer details'            => 'Kundendetails',
   'DATEV Export'                => 'DATEV-Export',
   'DELETED'                     => 'Gelöscht',
+  'DR'                          => 'S',
   'DUNNING STARTED'             => 'Mahnprozess gestartet',
   'Dataset upgrade'             => 'Datenbankaktualisierung',
   'Date'                        => 'Datum',
@@ -82,7 +99,7 @@ $self->{texts} = {
   'Packing List'                => 'Lieferschein',
   'Part Number'                 => 'Artikelnummer',
   'Part description'            => 'Artikelbeschreibung',
-  'Pick List'                   => 'Packliste',
+  'Pick List'                   => 'Sammelliste',
   'Please enter values'         => 'Bitte Werte eingeben',
   'Preview'                     => 'Druckvorschau',
   'Proforma Invoice'            => 'Proformarechnung',
@@ -123,6 +140,7 @@ $self->{texts} = {
   'View warehouse content'      => 'Lagerbestand ansehen',
   'Warehouse management'        => 'Lagerverwaltung/Bestandsveränderung',
   'You do not have the permissions to access this function.' => 'Sie verfügen nicht über die notwendigen Rechte, um auf diese Funktion zuzugreifen.',
+  '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.',
   '[email]'                     => '[email]',
   'bin_list'                    => 'Lagerliste',
   'config/authentication.pl: Key "DB_config" is missing.' => 'config/authentication.pl: Das Schlüsselwort "DB_config" fehlt.',
@@ -146,11 +164,12 @@ $self->{texts} = {
 $self->{subs} = {
   'E'                           => 'E',
   'H'                           => 'H',
-  'J'                           => 'J',
   'NTI'                         => 'NTI',
   'Q'                           => 'Q',
   'analyze'                     => 'analyze',
   'analyze_filter'              => 'analyze_filter',
+  'ap_transaction'              => 'ap_transaction',
+  'ar_transaction'              => 'ar_transaction',
   'assistant'                   => 'assistant',
   'assistant_for_ap_ar_wrong_taxkeys' => 'assistant_for_ap_ar_wrong_taxkeys',
   'assistant_for_invoice_inventory_with_taxkeys' => 'assistant_for_invoice_inventory_with_taxkeys',
@@ -167,16 +186,19 @@ $self->{subs} = {
   'fix_invoice_inventory_with_taxkeys' => 'fix_invoice_inventory_with_taxkeys',
   'fix_wrong_taxkeys'           => 'fix_wrong_taxkeys',
   'format_dates'                => 'format_dates',
+  'gl_transaction'              => 'gl_transaction',
   'mark_as_paid_common'         => 'mark_as_paid_common',
   'part_selection_internal'     => 'part_selection_internal',
   'redirect'                    => 'redirect',
   'reformat_numbers'            => 'reformat_numbers',
   'retrieve_partunits'          => 'retrieve_partunits',
+  'sales_invoice'               => 'sales_invoice',
   'select_part'                 => 'select_part',
   'select_part_internal'        => 'select_part_internal',
   'set_longdescription'         => 'set_longdescription',
   'show_history'                => 'show_history',
   'show_vc_details'             => 'show_vc_details',
+  'vendor_invoice'              => 'vendor_invoice',
   'vendor_selection'            => 'vendor_selection',
   'weiter'                      => 'continue',
   'buchung_löschen'             => 'delete_transaction',

diff --git a/locale/de/ct b/locale/de/ct
index 609c00c..9cb4384 100644 (file)
--- a/locale/de/ct
+++ b/locale/de/ct
@@ -72,7 +72,6 @@ $self->{texts} = {
   'Dataset upgrade'             => 'Datenbankaktualisierung',
   'Date'                        => 'Datum',
   'Delivery Order'              => 'Lieferschein',
-  'Department'                  => 'Abteilung',
   'Dependency loop detected:'   => 'Schleife in den Abhängigkeiten entdeckt:',
   'Directory'                   => 'Verzeichnis',
   'Dunning'                     => 'Mahnung',

diff --git a/locale/de/do b/locale/de/do
index 2764532..ae711ea 100644 (file)
--- a/locale/de/do
+++ b/locale/de/do
@@ -159,6 +159,7 @@ $self->{texts} = {
   'No %s was found matching the search parameters.' => 'Es wurde kein %s gefunden, auf den die Suchparameter zutreffen.',
   'No Customer was found matching the search parameters.' => 'Zu dem Suchbegriff wurde kein Endkunde gefunden',
   'No Vendor was found matching the search parameters.' => 'Zu dem Suchbegriff wurde kein Händler gefunden',
+  'No action defined.'          => 'Keine Aktion definiert.',
   'No customer has been selected yet.' => 'Es wurde noch kein Kunde ausgewählt.',
   'No or an unknown authenticantion module specified in "config/authentication.pl".' => 'Es wurde kein oder ein unbekanntes Authentifizierungsmodul in "config/authentication.pl" angegeben.',
   'No part was found matching the search parameters.' => 'Es wurde kein Artikel gefunden, auf den die Suchparameter zutreffen.',
@@ -344,6 +345,7 @@ $self->{subs} = {
   'delete'                      => 'delete',
   'delete_delivery_order'       => 'delete_delivery_order',
   'delivery_customer_selection' => 'delivery_customer_selection',
+  'dispatcher'                  => 'dispatcher',
   'display_form'                => 'display_form',
   'display_row'                 => 'display_row',
   'display_stock_in_form'       => 'display_stock_in_form',

diff --git a/locale/de/ic b/locale/de/ic
index ab6c1fc..a43079e 100644 (file)
--- a/locale/de/ic
+++ b/locale/de/ic
@@ -146,7 +146,7 @@ $self->{texts} = {
   'List Price'                  => 'Listenpreis',
   'Long Description'            => 'Langtext',
   'MAILED'                      => 'Gesendet',
-  'Make'                        => 'Hersteller',
+  'Make'                        => 'Lieferant',
   'Manage license keys'         => 'Lizenzschlüssel verwalten',
   'Mar'                         => 'März',
   'March'                       => 'März',
@@ -162,7 +162,7 @@ $self->{texts} = {
   'Missing \'tag\' field.'      => 'Fehlendes Feld \'tag\'.',
   'Missing parameter #1 in call to sub #2.' => 'Fehlernder Parameter \'#1\' in Funktionsaufruf \'#2\'.',
   'Missing parameter (at least one of #1) in call to sub #2.' => 'Fehlernder Parameter (mindestens einer aus \'#1\') in Funktionsaufruf \'#2\'.',
-  'Model'                       => 'Modell',
+  'Model'                       => 'Lieferanten-Art-Nr.',
   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Name'                        => 'Name',
   'No'                          => 'Nein',
@@ -223,6 +223,7 @@ $self->{texts} = {
   'Proforma Invoice'            => 'Proformarechnung',
   'Project'                     => 'Projekt',
   'Purchase Order'              => 'Lieferantenauftrag',
+  'Purchase Price'              => 'Einkaufspreis',
   'Qty'                         => 'Menge',
   'Queue'                       => 'Warteschlange',
   'Quotation'                   => 'Angebot',

diff --git a/locale/de/oe b/locale/de/oe
index 334eddf..86a14a5 100644 (file)
--- a/locale/de/oe
+++ b/locale/de/oe
@@ -187,6 +187,7 @@ $self->{texts} = {
   'No %s was found matching the search parameters.' => 'Es wurde kein %s gefunden, auf den die Suchparameter zutreffen.',
   'No Customer was found matching the search parameters.' => 'Zu dem Suchbegriff wurde kein Endkunde gefunden',
   'No Vendor was found matching the search parameters.' => 'Zu dem Suchbegriff wurde kein Händler gefunden',
+  'No action defined.'          => 'Keine Aktion definiert.',
   'No customer has been selected yet.' => 'Es wurde noch kein Kunde ausgewählt.',
   'No or an unknown authenticantion module specified in "config/authentication.pl".' => 'Es wurde kein oder ein unbekanntes Authentifizierungsmodul in "config/authentication.pl" angegeben.',
   'No part was found matching the search parameters.' => 'Es wurde kein Artikel gefunden, auf den die Suchparameter zutreffen.',
@@ -407,6 +408,7 @@ $self->{subs} = {
   'delete_order_quotation'      => 'delete_order_quotation',
   'delivery_customer_selection' => 'delivery_customer_selection',
   'delivery_order'              => 'delivery_order',
+  'dispatcher'                  => 'dispatcher',
   'display_form'                => 'display_form',
   'display_row'                 => 'display_row',
   'display_stock_in_form'       => 'display_stock_in_form',

diff --git a/templates/webpages/do/form_footer_de.html b/templates/webpages/do/form_footer_de.html
index 79dce97..b9f8ddf 100644 (file)
--- a/templates/webpages/do/form_footer_de.html
+++ b/templates/webpages/do/form_footer_de.html
@@ -55,25 +55,26 @@
 
   <p>
    Lieferschein bearbeiten<br>
-   <input class="submit" type="submit" name="action" id="update_button" value="Erneuern">
+   <input type="hidden" name="action" value="dispatcher">
+   <input class="submit" type="submit" name="action_update" id="update_button" value="Erneuern">
    [%- UNLESS delivered %]
    [%- IF vc == 'customer' %]
-   <input class="submit" type="submit" name="action" value="Lieferadresse">
+   <input class="submit" type="submit" name="action_ship_to" value="Lieferadresse">
    [%- END %]
    [%- END %]
-   <input class="submit" type="submit" name="action" value="Drucken">
-   <input class="submit" type="submit" name="action" value="eMail">
+   <input class="submit" type="submit" name="action_print" value="Drucken">
+   <input class="submit" type="submit" name="action_e_mail" value="eMail">
    [%- UNLESS delivered %]
-   <input class="submit" type="submit" name="action" value="Speichern">
+   <input class="submit" type="submit" name="action_save" value="Speichern">
    [%- IF vc == 'customer' %]
-   <input class="submit" type="submit" name="action" value="Auslagern">
+   <input class="submit" type="submit" name="action_transfer_out" value="Auslagern">
    [%- ELSE %]
-   <input class="submit" type="submit" name="action" value="Einlagern">
+   <input class="submit" type="submit" name="action_transfer_in" value="Einlagern">
    [%- END %]
    [%- END %]
    [%- IF id %]
    [%- UNLESS closed %]
-   <input class="submit" type="submit" name="action" value="Schließen">
+   <input class="submit" type="submit" name="action_mark_closed" value="Schließen">
    [%- END %]
    <input type="button" class="submit" onclick="set_history_window([% id %]);" name="history" id="history" value="Historie">
    [%- END %]
@@ -82,11 +83,11 @@
   [%- IF id %]
   <p>
    Workflow Lieferschein<br>
-   <input class="submit" type="submit" name="action" value="als neu speichern">
+   <input class="submit" type="submit" name="action_save_as_new" value="als neu speichern">
    [% UNLESS delivered %]
-   <input class="submit" type="submit" name="action" value="Löschen">
+   <input class="submit" type="submit" name="action_delete" value="Löschen">
    [% END %]
-   <input class="submit" type="submit" name="action" value="Rechnung">
+   <input class="submit" type="submit" name="action_invoice" value="Rechnung">
   </p>
   [%- END %]
 

diff --git a/templates/webpages/do/form_footer_master.html b/templates/webpages/do/form_footer_master.html
index af19a82..cb04003 100644 (file)
--- a/templates/webpages/do/form_footer_master.html
+++ b/templates/webpages/do/form_footer_master.html
@@ -55,25 +55,26 @@
 
   <p>
    <translate>Edit the Delivery Order</translate><br>
-   <input class="submit" type="submit" name="action" id="update_button" value="<translate>Update</translate>">
+   <input type="hidden" name="action" value="dispatcher">
+   <input class="submit" type="submit" name="action_update" id="update_button" value="<translate>Update</translate>">
    [%- UNLESS delivered %]
    [%- IF vc == 'customer' %]
-   <input class="submit" type="submit" name="action" value="<translate>Ship to</translate>">
+   <input class="submit" type="submit" name="action_ship_to" 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>">
+   <input class="submit" type="submit" name="action_print" value="<translate>Print</translate>">
+   <input class="submit" type="submit" name="action_e_mail" value="<translate>E-mail</translate>">
    [%- UNLESS delivered %]
-   <input class="submit" type="submit" name="action" value="<translate>Save</translate>">
+   <input class="submit" type="submit" name="action_save" value="<translate>Save</translate>">
    [%- IF vc == 'customer' %]
-   <input class="submit" type="submit" name="action" value="<translate>Transfer out</translate>">
+   <input class="submit" type="submit" name="action_transfer_out" value="<translate>Transfer out</translate>">
    [%- ELSE %]
-   <input class="submit" type="submit" name="action" value="<translate>Transfer in</translate>">
+   <input class="submit" type="submit" name="action_transfer_in" value="<translate>Transfer in</translate>">
    [%- END %]
    [%- END %]
    [%- IF id %]
    [%- UNLESS closed %]
-   <input class="submit" type="submit" name="action" value="<translate>Mark closed</translate>">
+   <input class="submit" type="submit" name="action_mark_closed" value="<translate>Mark closed</translate>">
    [%- END %]
    <input type="button" class="submit" onclick="set_history_window([% id %]);" name="history" id="history" value="<translate>history</translate>">
    [%- END %]
@@ -82,11 +83,11 @@
   [%- IF id %]
   <p>
    <translate>Workflow Delivery Order</translate><br>
-   <input class="submit" type="submit" name="action" value="<translate>Save as new</translate>">
+   <input class="submit" type="submit" name="action_save_as_new" value="<translate>Save as new</translate>">
    [% UNLESS delivered %]
-   <input class="submit" type="submit" name="action" value="<translate>Delete</translate>">
+   <input class="submit" type="submit" name="action_delete" value="<translate>Delete</translate>">
    [% END %]
-   <input class="submit" type="submit" name="action" value="<translate>Invoice</translate>">
+   <input class="submit" type="submit" name="action_invoice" value="<translate>Invoice</translate>">
   </p>
   [%- END %]