Datenbankadministration: Es fehlte ein Button, um von der Datenbanksicherung per...

diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index edbb35cc48ee10dada3917bf2042f6e19ef1f3bf..b8ec2f74800916f64d3bf50320f26d1f31907713 100644 (file)
--- a/bin/mozilla/admin.pl
+++ b/bin/mozilla/admin.pl
@@ -579,6 +579,10 @@ sub continue {
   call_sub($form->{"nextsub"});
 }
 
+sub back {
+  call_sub($form->{"back_nextsub"});
+}
+
 sub update_dataset {
   $form->{title} =
       "Lx-Office ERP "

diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index 24e75ea0c46ecda5d8db740c50c5047b35c826c9..77f911d1694070298505aea6f906317d6a89aa77 100644 (file)
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -46,6 +46,7 @@ require "bin/mozilla/drafts.pl";
 
 sub add {
   $lxdebug->enter_sub();
+  $form->{"Watchdog::invdate,duedate,vendor,vendor_id"} = 1;
 
   return $lxdebug->leave_sub() if (load_draft_maybe());
 

diff --git a/locale/de/admin b/locale/de/admin
index fe2c9155d0f1b3dc048d598b939fce7c71aca0f8..bb24d7c9ca466fd618d1f58798cb2062a17c6252 100644 (file)
--- a/locale/de/admin
+++ b/locale/de/admin
@@ -118,6 +118,7 @@ $self->{subs} = {
   'Q'                           => 'Q',
   'add_user'                    => 'add_user',
   'adminlogin'                  => 'adminlogin',
+  'back'                        => 'back',
   'backup_dataset'              => 'backup_dataset',
   'backup_dataset_start'        => 'backup_dataset_start',
   'build_std_url'               => 'build_std_url',
@@ -163,6 +164,7 @@ $self->{subs} = {
   'update_dataset'              => 'update_dataset',
   'vendor_selection'            => 'vendor_selection',
   'benutzer_erfassen'           => 'add_user',
+  'zurück'                      => 'back',
   'datenbank_sichern'           => 'backup_dataset',
   'administratorpasswort_ändern' => 'change_admin_password',
   'passwort_ändern'             => 'change_password',

diff --git a/locale/de/all b/locale/de/all
index ecbc1fa38860d329ae3cecb073162f76035c684f..3c5790738023edfed8ad6af079a8c89f916d6ef1 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -170,7 +170,7 @@ aktualisieren wollen?',
   'Automatically created invoice for fee and interest for dunning %s' => 'Automatisch erzeugte Rechnung für Gebühren und Zinsen zu Mahnung %s',
   'BOM'                         => 'Stückliste',
   'BWA'                         => 'BWA',
-  'Back'                        => 'Zurück',
+  'Back'                        => 'Zurück',
   'Backup Dataset'              => 'Datenbank sichern',
   'Backup file'                 => 'Sicherungsdatei',
   'Backup of dataset'           => 'Sicherung der Datenbank',

diff --git a/locale/de/oe b/locale/de/oe
index 639a795f444345f010559dcc5e0c7b454615b86b..61128e378467101269608184cde626d25e347b72 100644 (file)
--- a/locale/de/oe
+++ b/locale/de/oe
@@ -288,6 +288,7 @@ $self->{subs} = {
   'build_std_url'               => 'build_std_url',
   'calculate_qty'               => 'calculate_qty',
   'call_sub'                    => 'call_sub',
+  'check_delivered_flag'        => 'check_delivered_flag',
   'check_for_direct_delivery'   => 'check_for_direct_delivery',
   'check_for_direct_delivery_no' => 'check_for_direct_delivery_no',
   'check_for_direct_delivery_yes' => 'check_for_direct_delivery_yes',

diff --git a/templates/webpages/admin/backup_dataset_de.html b/templates/webpages/admin/backup_dataset_de.html
index cb402b5276bd7a29d3e88d26580b36e1759a0f0b..6ee0fc71749d28559b5bfe0649e76c9f3de2f29c 100644 (file)
--- a/templates/webpages/admin/backup_dataset_de.html
+++ b/templates/webpages/admin/backup_dataset_de.html
@@ -80,12 +80,14 @@
    <input name="callback" type="hidden" value="admin.pl?action=list_users&rpw=<TMPL_VAR rpw ESCAPE=URL>">
    <input type="hidden" name="rpw" value="<TMPL_VAR rpw ESCAPE=HTML>">
    <input type="hidden" name="nextsub" value="backup_dataset_start">
+   <input type="hidden" name="back_nextsub" value="list_users">
 
    <hr size="3" noshade>
 
    <br>
 
    <input type="submit" class="submit" name="action" value="Weiter">
+   <input type="submit" class="submit" name="action" value="Zurück">
 
   </form>
 

diff --git a/templates/webpages/admin/backup_dataset_master.html b/templates/webpages/admin/backup_dataset_master.html
index 3368b9d2781d7cd958ceecc2b2cd29a663668f89..41dc331b0f06e27cdcf58ca2c453a038963ba628 100644 (file)
--- a/templates/webpages/admin/backup_dataset_master.html
+++ b/templates/webpages/admin/backup_dataset_master.html
@@ -80,12 +80,14 @@
    <input name="callback" type="hidden" value="admin.pl?action=list_users&rpw=<TMPL_VAR rpw ESCAPE=URL>">
    <input type="hidden" name="rpw" value="<TMPL_VAR rpw ESCAPE=HTML>">
    <input type="hidden" name="nextsub" value="backup_dataset_start">
+   <input type="hidden" name="back_nextsub" value="list_users">
 
    <hr size="3" noshade>
 
    <br>
 
    <input type="submit" class="submit" name="action" value="<translate>Continue</translate>">
+   <input type="submit" class="submit" name="action" value="<translate>Back</translate>">
 
   </form>
 

diff --git a/templates/webpages/dbupgrade/units_error_de.html b/templates/webpages/dbupgrade/units_error_de.html
index 4c785a8413a5f30771e913321b60fb544cc30ae6..67a0932d3da762c18b9b1ef88f41ccd14a1417d7 100644 (file)
--- a/templates/webpages/dbupgrade/units_error_de.html
+++ b/templates/webpages/dbupgrade/units_error_de.html
@@ -1,5 +1,5 @@
 <p><b>Fehler:</b> <TMPL_VAR message></p>
 
 <form>
-<input type="button" onclick="history.back()" value="Zur&uuml;ck">
+<input type="button" onclick="history.back()" value="Zurück">
 </form>