Möglichkeit zum Löschen von gespeicherten Entwürfen eingebaut.

diff --git a/SL/Drafts.pm b/SL/Drafts.pm
index 63da852..698b217 100644 (file)
--- a/SL/Drafts.pm
+++ b/SL/Drafts.pm
@@ -108,16 +108,17 @@ sub load {
 sub remove {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig, $form, $draft_id) = @_;
+  my ($self, $myconfig, $form, @draft_ids) = @_;
 
-  return $main::lxdebug->leave_sub() unless ($draft_id);
+  return $main::lxdebug->leave_sub() unless (@draft_ids);
 
-  my ($dbh, $sth, $query, @values);
+  my ($dbh, $sth, $query);
 
   $dbh = $form->dbconnect($myconfig);
 
-  $query = qq|DELETE FROM drafts WHERE id = ?|;
-  do_query($form, $dbh, $query, $draft_id);
+  $query = qq|DELETE FROM drafts WHERE id IN (| .
+    join(", ", map({ "?" } @draft_ids)) . qq|)|;
+  do_query($form, $dbh, $query, @draft_ids);
 
   $dbh->disconnect();
 

diff --git a/bin/mozilla/drafts.pl b/bin/mozilla/drafts.pl
index df0eb6b..c10d91a 100644 (file)
--- a/bin/mozilla/drafts.pl
+++ b/bin/mozilla/drafts.pl
@@ -83,6 +83,7 @@ sub dont_load_draft {
   my $draft_nextsub = $form->{draft_nextsub};
   $draft_nextsub = "add" unless ($form->{draft_nextsub});
   restore_form($form->{SAVED_FORM}, 1);
+  delete($form->{SAVED_FORM});
   delete($form->{action});
   $form->{DONT_LOAD_DRAFT} = 1;
 
@@ -107,4 +108,32 @@ sub load_draft {
   $lxdebug->leave_sub();
 }
 
+sub delete_drafts {
+  $lxdebug->enter_sub();
+
+  my @ids;
+  foreach (keys(%{$form})) {
+    push(@ids, $1) if (/^checked_(.*)/ && $form->{$_});
+  }
+  Drafts->remove(\%myconfig, $form, @ids) if (@ids);
+  restore_form($form->{SAVED_FORM}, 1);
+  delete($form->{SAVED_FORM});
+
+  add();
+
+  $lxdebug->leave_sub();
+}
+
+sub draft_action_dispatcher {
+  $lxdebug->enter_sub();
+
+  if ($form->{draft_action} eq $locale->text("Skip")) {
+    dont_load_draft();
+  } elsif ($form->{draft_action} eq $locale->text("Delete drafts")) {
+    delete_drafts();
+  }
+
+  $lxdebug->leave_sub();
+}
+
 1;

diff --git a/locale/de/all b/locale/de/all
index 9b9b63e..5c5c5b7 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -351,6 +351,7 @@ aktualisieren wollen?',
   'Delete'                      => 'Löschen',
   'Delete Account'              => 'Konto löschen',
   'Delete Dataset'              => 'Datenbank löschen',
+  'Delete drafts'               => 'Entwürfe löschen',
   'Delivered'                   => 'Geliefert',
   'Delivery Date'               => 'Lieferdatum',
   'Department'                  => 'Abteilung',

diff --git a/locale/de/ap b/locale/de/ap
index 9fe0d4c..25da8e7 100644 (file)
--- a/locale/de/ap
+++ b/locale/de/ap
@@ -33,6 +33,7 @@ $self->{texts} = {
   'Dec'                         => 'Dez',
   'December'                    => 'Dezember',
   'Delete'                      => 'Löschen',
+  'Delete drafts'               => 'Entwürfe löschen',
   'Department'                  => 'Abteilung',
   'Description'                 => 'Beschreibung',
   'Draft saved.'                => 'Entwurf gespeichert.',
@@ -113,6 +114,7 @@ $self->{texts} = {
   'Select from one of the projects below' => 'Wählen Sie eines der untenstehenden Projekte',
   'Sep'                         => 'Sep',
   'September'                   => 'September',
+  'Skip'                        => 'Überspringen',
   'Source'                      => 'Beleg',
   'Subtotal'                    => 'Zwischensumme',
   'Tax'                         => 'Steuer',
@@ -162,9 +164,11 @@ $self->{subs} = {
   'continue'                    => 'continue',
   'create_links'                => 'create_links',
   'delete'                      => 'delete',
+  'delete_drafts'               => 'delete_drafts',
   'delivery_customer_selection' => 'delivery_customer_selection',
   'display_form'                => 'display_form',
   'dont_load_draft'             => 'dont_load_draft',
+  'draft_action_dispatcher'     => 'draft_action_dispatcher',
   'edit'                        => 'edit',
   'employee_selection_internal' => 'employee_selection_internal',
   'form_footer'                 => 'form_footer',
@@ -204,6 +208,7 @@ $self->{subs} = {
   'kreditorenbuchung_erfassen'  => 'add_accounts_payables_transaction',
   'weiter'                      => 'continue',
   'löschen'                     => 'delete',
+  'entwürfe_löschen'            => 'delete_drafts',
   'kreditorenbuchung_bearbeiten' => 'edit_accounts_payables_transaction',
   'buchen'                      => 'post',
   'zahlung_buchen'              => 'post_payment',

diff --git a/locale/de/ar b/locale/de/ar
index ef7d19b..d6669da 100644 (file)
--- a/locale/de/ar
+++ b/locale/de/ar
@@ -37,6 +37,7 @@ $self->{texts} = {
   'Dec'                         => 'Dez',
   'December'                    => 'Dezember',
   'Delete'                      => 'Löschen',
+  'Delete drafts'               => 'Entwürfe löschen',
   'Department'                  => 'Abteilung',
   'Description'                 => 'Beschreibung',
   'Draft saved.'                => 'Entwurf gespeichert.',
@@ -121,6 +122,7 @@ $self->{texts} = {
   'September'                   => 'September',
   'Ship via'                    => 'Transportmittel',
   'Shipping Point'              => 'Versandort',
+  'Skip'                        => 'Überspringen',
   'Source'                      => 'Beleg',
   'Storno (one letter abbreviation)' => 'S',
   'Subtotal'                    => 'Zwischensumme',
@@ -170,10 +172,12 @@ $self->{subs} = {
   'continue'                    => 'continue',
   'create_links'                => 'create_links',
   'delete'                      => 'delete',
+  'delete_drafts'               => 'delete_drafts',
   'delivery_customer_selection' => 'delivery_customer_selection',
   'display'                     => 'display',
   'display_form'                => 'display_form',
   'dont_load_draft'             => 'dont_load_draft',
+  'draft_action_dispatcher'     => 'draft_action_dispatcher',
   'edit'                        => 'edit',
   'employee_selection_internal' => 'employee_selection_internal',
   'form_footer'                 => 'form_footer',
@@ -213,6 +217,7 @@ $self->{subs} = {
   'debitorenbuchung'            => 'ar_transaction',
   'weiter'                      => 'continue',
   'löschen'                     => 'delete',
+  'entwürfe_löschen'            => 'delete_drafts',
   'buchen'                      => 'post',
   'zahlung_buchen'              => 'post_payment',
   'rechnung'                    => 'sales_invoice',

diff --git a/locale/de/drafts b/locale/de/drafts
index 13272f4..ff6ed6a 100644 (file)
--- a/locale/de/drafts
+++ b/locale/de/drafts
@@ -4,6 +4,7 @@ $self->{texts} = {
   'Customer Number'             => 'Kundennummer',
   'DELETED'                     => 'Gelöscht',
   'DUNNING STARTED'             => 'DUNNING STARTED',
+  'Delete drafts'               => 'Entwürfe löschen',
   'Draft saved.'                => 'Entwurf gespeichert.',
   'ELSE'                        => 'Zusatz',
   'Enter longdescription'       => 'Langtext eingeben',
@@ -31,6 +32,7 @@ $self->{texts} = {
   'Select a part'               => 'Artikel auswählen',
   'Select a project'            => 'Projekt auswählen',
   'Select an employee'          => 'Angestellten auswählen',
+  'Skip'                        => 'Überspringen',
   'Unit'                        => 'Einheit',
   'Value'                       => 'Wert',
   'Variable'                    => 'Variable',
@@ -52,8 +54,10 @@ $self->{subs} = {
   'Q'                           => 'Q',
   'build_std_url'               => 'build_std_url',
   'calculate_qty'               => 'calculate_qty',
+  'delete_drafts'               => 'delete_drafts',
   'delivery_customer_selection' => 'delivery_customer_selection',
   'dont_load_draft'             => 'dont_load_draft',
+  'draft_action_dispatcher'     => 'draft_action_dispatcher',
   'employee_selection_internal' => 'employee_selection_internal',
   'format_dates'                => 'format_dates',
   'load_draft'                  => 'load_draft',
@@ -72,6 +76,7 @@ $self->{subs} = {
   'set_longdescription'         => 'set_longdescription',
   'show_history'                => 'show_history',
   'vendor_selection'            => 'vendor_selection',
+  'entwürfe_löschen'            => 'delete_drafts',
   'entwurf_speichern'           => 'save_draft',
   'Überspringen'                => 'skip',
 };

diff --git a/locale/de/ir b/locale/de/ir
index 2e5ec9a..02181d1 100644 (file)
--- a/locale/de/ir
+++ b/locale/de/ir
@@ -49,6 +49,7 @@ $self->{texts} = {
   'Dec'                         => 'Dez',
   'December'                    => 'Dezember',
   'Delete'                      => 'Löschen',
+  'Delete drafts'               => 'Entwürfe löschen',
   'Delivery Date'               => 'Lieferdatum',
   'Department'                  => 'Abteilung',
   'Description'                 => 'Beschreibung',
@@ -183,6 +184,7 @@ $self->{texts} = {
   'Ship to'                     => 'Lieferadresse',
   'Shipping Address'            => 'Lieferadresse',
   'Show details'                => 'Details anzeigen',
+  'Skip'                        => 'Überspringen',
   'Source'                      => 'Beleg',
   'Steuersatz'                  => 'Steuersatz',
   'Storno'                      => 'Storno',
@@ -242,10 +244,12 @@ $self->{subs} = {
   'continue'                    => 'continue',
   'customer_details'            => 'customer_details',
   'delete'                      => 'delete',
+  'delete_drafts'               => 'delete_drafts',
   'delivery_customer_selection' => 'delivery_customer_selection',
   'display_form'                => 'display_form',
   'display_row'                 => 'display_row',
   'dont_load_draft'             => 'dont_load_draft',
+  'draft_action_dispatcher'     => 'draft_action_dispatcher',
   'e_mail'                      => 'e_mail',
   'edit'                        => 'edit',
   'employee_selection_internal' => 'employee_selection_internal',
@@ -304,6 +308,7 @@ $self->{subs} = {
   'yes'                         => 'yes',
   'weiter'                      => 'continue',
   'löschen'                     => 'delete',
+  'entwürfe_löschen'            => 'delete_drafts',
   'buchen'                      => 'post',
   'zahlung_buchen'              => 'post_payment',
   'entwurf_speichern'           => 'save_draft',

diff --git a/locale/de/is b/locale/de/is
index 079dbef..29f52b3 100644 (file)
--- a/locale/de/is
+++ b/locale/de/is
@@ -60,6 +60,7 @@ $self->{texts} = {
   'Dec'                         => 'Dez',
   'December'                    => 'Dezember',
   'Delete'                      => 'Löschen',
+  'Delete drafts'               => 'Entwürfe löschen',
   'Delivery Date'               => 'Lieferdatum',
   'Department'                  => 'Abteilung',
   'Description'                 => 'Beschreibung',
@@ -208,6 +209,7 @@ $self->{texts} = {
   'Shipping Address'            => 'Lieferadresse',
   'Shipping Point'              => 'Versandort',
   'Show details'                => 'Details anzeigen',
+  'Skip'                        => 'Überspringen',
   'Source'                      => 'Beleg',
   'Steuersatz'                  => 'Steuersatz',
   'Storno'                      => 'Storno',
@@ -267,10 +269,12 @@ $self->{subs} = {
   'credit_note'                 => 'credit_note',
   'customer_details'            => 'customer_details',
   'delete'                      => 'delete',
+  'delete_drafts'               => 'delete_drafts',
   'delivery_customer_selection' => 'delivery_customer_selection',
   'display_form'                => 'display_form',
   'display_row'                 => 'display_row',
   'dont_load_draft'             => 'dont_load_draft',
+  'draft_action_dispatcher'     => 'draft_action_dispatcher',
   'e_mail'                      => 'e_mail',
   'edit'                        => 'edit',
   'employee_selection_internal' => 'employee_selection_internal',
@@ -332,6 +336,7 @@ $self->{subs} = {
   'weiter'                      => 'continue',
   'gutschrift'                  => 'credit_note',
   'löschen'                     => 'delete',
+  'entwürfe_löschen'            => 'delete_drafts',
   'email'                       => 'e_mail',
   'auftrag'                     => 'order',
   'buchen'                      => 'post',

diff --git a/templates/webpages/drafts/load_de.html b/templates/webpages/drafts/load_de.html
index a5b4979..95eb33f 100644 (file)
--- a/templates/webpages/drafts/load_de.html
+++ b/templates/webpages/drafts/load_de.html
@@ -24,6 +24,7 @@
     <td>
      <table>
       <tr>
+       <th class="listheading">&nbsp;</th>
        <th class="listheading">Datum</th>
        <th class="listheading">Beschreibung</th>
        <th class="listheading">Bearbeiter</th>
@@ -31,6 +32,7 @@
 
       <TMPL_LOOP DRAFTS>
        <tr class="listrow<TMPL_IF __odd__>1<TMPL_ELSE>0</TMPL_IF>">
+        <td><input type="checkbox" name="checked_<TMPL_VAR id>" value="1"></td>
         <td><TMPL_VAR itime ESCAPE=HTML></td>
         <td><a href="<TMPL_VAR script ESCAPE=URL>?login=<TMPL_VAR login ESCAPE=URL>&password=<TMPL_VAR password ESCAPE=URL>&path=<TMPL_VAR path ESCAPE=URL>&action=load_draft&id=<TMPL_VAR id ESCAPE=URL>"><TMPL_VAR description ESCAPE=HTML></a></td>
         <td><TMPL_VAR employee_name ESCAPE=HTML></td>
@@ -42,8 +44,9 @@
 
    <tr>
     <td>
-     <input type="hidden" name="action" value="dont_load_draft">
-     <input type="submit" class="submit" name="dummy" value="Überspringen">
+     <input type="hidden" name="action" value="draft_action_dispatcher">
+     <input type="submit" class="submit" name="draft_action" value="Überspringen">
+     <input type="submit" class="submit" name="draft_action" value="Entwürfe löschen">
     </td>
    </tr>
   </table>

diff --git a/templates/webpages/drafts/load_master.html b/templates/webpages/drafts/load_master.html
index f12c3f2..6f42c6d 100644 (file)
--- a/templates/webpages/drafts/load_master.html
+++ b/templates/webpages/drafts/load_master.html
@@ -24,6 +24,7 @@
     <td>
      <table>
       <tr>
+       <th class="listheading">&nbsp;</th>
        <th class="listheading"><translate>Date</translate></th>
        <th class="listheading"><translate>Description</translate></th>
        <th class="listheading"><translate>Employee</translate></th>
@@ -31,6 +32,7 @@
 
       <TMPL_LOOP DRAFTS>
        <tr class="listrow<TMPL_IF __odd__>1<TMPL_ELSE>0</TMPL_IF>">
+        <td><input type="checkbox" name="checked_<TMPL_VAR id>" value="1"></td>
         <td><TMPL_VAR itime ESCAPE=HTML></td>
         <td><a href="<TMPL_VAR script ESCAPE=URL>?login=<TMPL_VAR login ESCAPE=URL>&password=<TMPL_VAR password ESCAPE=URL>&path=<TMPL_VAR path ESCAPE=URL>&action=load_draft&id=<TMPL_VAR id ESCAPE=URL>"><TMPL_VAR description ESCAPE=HTML></a></td>
         <td><TMPL_VAR employee_name ESCAPE=HTML></td>
@@ -42,8 +44,9 @@
 
    <tr>
     <td>
-     <input type="hidden" name="action" value="dont_load_draft">
-     <input type="submit" class="submit" name="dummy" value="<translate>Skip</translate>">
+     <input type="hidden" name="action" value="draft_action_dispatcher">
+     <input type="submit" class="submit" name="draft_action" value="<translate>Skip</translate>">
+     <input type="submit" class="submit" name="draft_action" value="<translate>Delete drafts</translate>">
     </td>
    </tr>
   </table>