Loeschen von Drafts flexibler.

Die Checkbos bestimmt ob ein Draft geloescht wird, nicht mehr automatisch beim laden.

diff --git a/SL/Drafts.pm b/SL/Drafts.pm
index 2ff3df86c5bda590544f7055e7ea21f8a3023539..63da852e7dd3628659233a6c58022c736da5be45 100644 (file)
--- a/SL/Drafts.pm
+++ b/SL/Drafts.pm
@@ -96,7 +96,7 @@ sub load {
   }
   $sth->finish();
 
-  do_query($form, $dbh, "DELETE FROM drafts WHERE id = ?", $draft_id);
+#  do_query($form, $dbh, "DELETE FROM drafts WHERE id = ?", $draft_id);
 
   $dbh->disconnect();
 

diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index 54a9c94b489a246d3f68094515d189ec30d670fb..18924979618cdc15c056fadb24d48b3102857b87 100644 (file)
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -1019,7 +1019,7 @@ sub post {
       $form->save_history($form->dbconnect(\%myconfig));
     }
     # /saving the history 
-    remove_draft();
+    remove_draft() if $form->{remove_draft};
     $form->redirect($locale->text('Transaction posted!'));
   }
   $form->error($locale->text('Cannot post transaction!'));

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index af47235a933f49ecc395998042a480781e280d9e..af964bbd71ada527df1848e00e269ea6363f3f7a 100644 (file)
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -1060,7 +1060,7 @@ sub post {
          $form->save_history($form->dbconnect(\%myconfig));
     }
     # /saving the history 
-    remove_draft();
+    remove_draft() if $form->{remove_draft};
     $form->redirect($locale->text('Transaction posted!'));
   }
   $form->error($locale->text('Cannot post transaction!'));

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index adb78ed49992699e6c68c2f871a13c43274898b7..f38ffe20a817ca48b6af5e9fcab301f693b1159c 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -1657,10 +1657,16 @@ sub print_options {
   }
 
   $form->{groupitems} = "checked" if $form->{groupitems};
+  $form->{remove_draft} = "checked" if $form->{remove_draft};
 
   print qq|
           <td>| . $locale->text('Group Items') . qq|</td>
-          <td><input name=groupitems type=checkbox class=checkbox $form->{groupitems}></td>
+          <td><input name=groupitems type=checkbox class=checkbox $form->{groupitems}></td>|;
+
+  print qq|
+          <td>| . $locale->text('Remove Draft') . qq|</td>
+          <td><input name=remove_draft type=checkbox class=checkbox $form->{remove_draft}></td>| if (!$form->{id} && $form->{draft_id});
+  print qq|
         </tr>
       </table>
     </td>

diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index a915146f42b042dde6724d629c3ae8bd550da56d..1515fa450dda1133dbb539fac95b397fc21d04a2 100644 (file)
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -1086,7 +1086,7 @@ sub post {
                $form->save_history($form->dbconnect(\%myconfig));
        }
        # /saving the history
-    remove_draft();
+    remove_draft() if $form->{remove_draft};
        $form->redirect(  $locale->text('Invoice')
                   . " $form->{invnumber} "
                   . $locale->text('posted!'));

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index d50d6d0f7d4919777edc1295c3f70259dc47df3f..30d0a072f5b7aa54ac10689162b523434af59421 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -1451,7 +1451,7 @@ sub post {
     if (!(IS->post_invoice(\%myconfig, \%$form))) {
       $form->error($locale->text('Cannot post invoice!'));
     }
-    remove_draft();
+    remove_draft() if $form->{remove_draft};
     # saving the history
        if(!exists $form->{addition}) {
          $form->{addition} = "PRINTED AND POSTED";
@@ -1461,7 +1461,7 @@ sub post {
     
   } else {
     if (IS->post_invoice(\%myconfig, \%$form)){
-      remove_draft();
+      remove_draft() if $form->{remove_draft};
        # saving the history
         if(!exists $form->{addition}) {
                        if($form->{storno}) {

diff --git a/locale/de/all b/locale/de/all
index 6b3674c848014a5159874771d2cab52cfa802a1e..9b9b63e8317bde99c1cd0a9d78088864ed1364e2 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -630,7 +630,6 @@ gestartet',
   'List Printer'                => 'Drucker anzeigen',
   'List Transactions'           => 'Buchungsliste',
   'Load draft'                  => 'Entwurf laden',
-  'Loading a draft will remove it from this list until you click the \'Save Draft\' button again.' => 'Das Laden eines Entwurfs wird ihn aus dieser Liste entfernen, bis Sie erneut auf \'Entwurf Speichern\' klicken.',
   'Local Tax Office Preferences' => 'Angaben zum Finanzamt',
   'Lock System'                 => 'System sperren',
   'Lockfile created!'           => 'System gesperrt!',
@@ -874,6 +873,7 @@ gestartet',
   'Reference missing!'          => 'Referenz fehlt!',
   'Remaining'                   => 'Rest',
   'Remove'                      => 'entfernen',
+  'Remove Draft'                => 'Entwurf löschen',
   'Removed spoolfiles!'         => 'Druckdateien entfernt!',
   'Removing marked entries from queue ...' => 'Markierte Einträge werden von der Warteschlange entfernt ...',
   'Repeat the password'         => 'Passwort wiederholen',

diff --git a/locale/de/cn b/locale/de/cn
index 1fb60ecf0fa70a2032a5486a035b47a174dc8d23..1dcff631534a5e596afa043729c7d702903b70f8 100644 (file)
--- a/locale/de/cn
+++ b/locale/de/cn
@@ -162,6 +162,7 @@ $self->{texts} = {
   'RFQ'                         => 'Anfrage',
   'Record in'                   => 'Buchen auf',
   'Remaining'                   => 'Rest',
+  'Remove Draft'                => 'Entwurf löschen',
   'Reqdate'                     => 'Lieferdatum',
   'Required by'                 => 'Lieferdatum',
   'SAVED'                       => 'Gespeichert',

diff --git a/locale/de/dn b/locale/de/dn
index c702fb5f849e37cd1769076e5249d6417d72ef67..49b45f2fd93ee250dee0db5bad6ec154fb29fea0 100644 (file)
--- a/locale/de/dn
+++ b/locale/de/dn
@@ -154,6 +154,7 @@ gestartet',
   'Quotation Date missing!'     => 'Angebotsdatum fehlt!',
   'Quotation Number missing!'   => 'Angebotsnummer fehlt!',
   'RFQ'                         => 'Anfrage',
+  'Remove Draft'                => 'Entwurf löschen',
   'Reqdate'                     => 'Lieferdatum',
   'Required by'                 => 'Lieferdatum',
   'SAVED'                       => 'Gespeichert',

diff --git a/locale/de/ic b/locale/de/ic
index 3f7d0bce1e53fa8d228bf4fdb38e7bc642033e06..823eee17400c4f3a669c16590d81bfe5851f89b9 100644 (file)
--- a/locale/de/ic
+++ b/locale/de/ic
@@ -182,6 +182,7 @@ aktualisieren wollen?',
   'Quoted'                      => 'Angeboten',
   'RFQ'                         => 'Anfrage',
   'ROP'                         => 'Mindestlagerbestand',
+  'Remove Draft'                => 'Entwurf löschen',
   'Reqdate'                     => 'Lieferdatum',
   'Required by'                 => 'Lieferdatum',
   'Revenue'                     => 'Erlöskonto',

diff --git a/locale/de/io b/locale/de/io
index b4348ee8857619b99003e179d51a16662d95bfa9..f7215ee573ac72d63e9e79fbbdb1375e903969b7 100644 (file)
--- a/locale/de/io
+++ b/locale/de/io
@@ -114,6 +114,7 @@ $self->{texts} = {
   'Quotation Date missing!'     => 'Angebotsdatum fehlt!',
   'Quotation Number missing!'   => 'Angebotsnummer fehlt!',
   'RFQ'                         => 'Anfrage',
+  'Remove Draft'                => 'Entwurf löschen',
   'Reqdate'                     => 'Lieferdatum',
   'Required by'                 => 'Lieferdatum',
   'SAVED'                       => 'Gespeichert',

diff --git a/locale/de/ir b/locale/de/ir
index 169da94630dc373cac3209f730fee8153ad2ada1..2e5ec9a0dbc56070b49e0b0f162062d5437948e5 100644 (file)
--- a/locale/de/ir
+++ b/locale/de/ir
@@ -157,6 +157,7 @@ $self->{texts} = {
   'Rechnungsnummer'             => 'Rechnungsnummer',
   'Record in'                   => 'Buchen auf',
   'Remaining'                   => 'Rest',
+  'Remove Draft'                => 'Entwurf löschen',
   'Reqdate'                     => 'Lieferdatum',
   'Required by'                 => 'Lieferdatum',
   'SAVED'                       => 'Gespeichert',

diff --git a/locale/de/is b/locale/de/is
index c32c469713874b4899af4d868894b53045d3916b..079dbef0503a9fcd5103e4fc163b69835955fc35 100644 (file)
--- a/locale/de/is
+++ b/locale/de/is
@@ -179,6 +179,7 @@ $self->{texts} = {
   'RFQ'                         => 'Anfrage',
   'Record in'                   => 'Buchen auf',
   'Remaining'                   => 'Rest',
+  'Remove Draft'                => 'Entwurf löschen',
   'Reqdate'                     => 'Lieferdatum',
   'Required by'                 => 'Lieferdatum',
   'SAVED'                       => 'Gespeichert',

diff --git a/locale/de/oe b/locale/de/oe
index 9676b16c84a45e9addea99d2908e080a53dd2a2a..9e99f536814916854dc593994250bbfaa11b6d54 100644 (file)
--- a/locale/de/oe
+++ b/locale/de/oe
@@ -182,6 +182,7 @@ $self->{texts} = {
   'RFQ'                         => 'Anfrage',
   'RFQ Number'                  => 'Anfragenummer',
   'Remaining'                   => 'Rest',
+  'Remove Draft'                => 'Entwurf löschen',
   'Reqdate'                     => 'Lieferdatum',
   'Request for Quotation'       => 'Anfrage',
   'Request for Quotations'      => 'Anfragen',

diff --git a/templates/webpages/drafts/load_de.html b/templates/webpages/drafts/load_de.html
index 3d589ccff106d30386e70f6c9e96fc5e8c1916b5..a5b4979f91af1aaec536207723c1c722af0b3e1b 100644 (file)
--- a/templates/webpages/drafts/load_de.html
+++ b/templates/webpages/drafts/load_de.html
@@ -17,7 +17,6 @@
    <tr>
     <td>
      Die folgenden Entw&uuml;rfe wurden gespeichert und k&ouml;nnen geladen werden.
-     Das Laden eines Entwurfs wird ihn aus dieser Liste entfernen, bis Sie erneut auf 'Entwurf Speichern' klicken.
     </td>
    </tr>
 

diff --git a/templates/webpages/drafts/load_master.html b/templates/webpages/drafts/load_master.html
index 81de720cd925fef65a9f717cfde0d1c2a51562bc..f12c3f24fa40567e676c333d283d0ae972b68be7 100644 (file)
--- a/templates/webpages/drafts/load_master.html
+++ b/templates/webpages/drafts/load_master.html
@@ -17,7 +17,6 @@
    <tr>
     <td>
      <translate>The following drafts have been saved and can be loaded.</translate>
-     <translate>Loading a draft will remove it from this list until you click the 'Save Draft' button again.</translate>
     </td>
    </tr>