From eb47358af822ef576792558c04b8fc15fb0c2ff8 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 11 Jul 2013 10:04:20 +0200
Subject: [PATCH] =?utf8?q?L=C3=B6schen=20von=20Lieferscheinen=20mit=20Java?=
 =?utf8?q?Script-Sicherheitsabfrage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 bin/mozilla/do.pl                      | 19 -------------------
 locale/de/all                          |  7 ++-----
 templates/webpages/do/delete.html      | 21 ---------------------
 templates/webpages/do/form_footer.html |  4 ++--
 4 files changed, 4 insertions(+), 47 deletions(-)
 delete mode 100644 templates/webpages/do/delete.html

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index cf0e806ce..ae804c8f6 100644
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -691,25 +691,6 @@ sub delete {
 
   check_do_access();
 
-  my $form     = $main::form;
-  my $locale   = $main::locale;
-
-  map { delete $form->{$_} } qw(action header login password);
-  my @variables = map { { 'key' => $_, 'value' => $form->{$_} } } grep { '' eq ref $form->{$_} } keys %{ $form };
-
-  $form->{title} = $locale->text('Delete delivery order');
-  $form->header();
-
-  print $form->parse_html_template('do/delete', { 'VARIABLES' => \@variables });
-
-  $main::lxdebug->leave_sub();
-}
-
-sub delete_delivery_order {
-  $main::lxdebug->enter_sub();
-
-  check_do_access();
-
   my $form     = $main::form;
   my %myconfig = %main::myconfig;
   my $locale   = $main::locale;
diff --git a/locale/de/all b/locale/de/all
index a376ed561..39d495ed8 100755
--- a/locale/de/all
+++ b/locale/de/all
@@ -210,7 +210,6 @@ $self->{texts} = {
   'Apr'                         => 'Apr',
   'April'                       => 'April',
   'Ar aging on %s'              => 'Offene Forderungen zum %s',
-  'Are you sure you want to delete Delivery Order Number #1?' => 'Sind Sie sicher, dass Sie Lieferschein #1 l&ouml;schen wollen?',
   'Are you sure you want to delete Invoice Number' => 'Soll die Rechnung mit folgender Nummer wirklich gelöscht werden:',
   'Are you sure you want to delete Transaction' => 'Buchung wirklich löschen?',
   'Are you sure you want to delete this background job?' => 'Sind Sie sicher, dass Sie diesen Hintergrund-Job löschen möchten?',
@@ -366,7 +365,7 @@ $self->{texts} = {
   'Cannot delete account!'      => 'Konto kann nicht gelöscht werden!',
   'Cannot delete customer!'     => 'Kunde kann nicht gelöscht werden!',
   'Cannot delete default account!' => 'Das Standard-Konto kann nicht gelöscht werden!',
-  'Cannot delete delivery order!' => 'Lieferschein kann nicht gel&ouml;scht werden!',
+  'Cannot delete delivery order!' => 'Lieferschein kann nicht gelöscht werden!',
   'Cannot delete invoice!'      => 'Rechnung kann nicht gelöscht werden!',
   'Cannot delete item!'         => 'Artikel kann nicht gelöscht werden!',
   'Cannot delete order!'        => 'Auftrag kann nicht gelöscht werden!',
@@ -460,7 +459,6 @@ $self->{texts} = {
   'Configuration'               => 'Konfiguration',
   'Configuration of individual TODO items' => 'Konfiguration f&uuml;r die einzelnen Aufgabenlistenpunkte',
   'Configure'                   => 'Konfigurieren',
-  'Confirm'                     => 'Best&auml;tigen',
   'Confirm!'                    => 'Bestätigen Sie!',
   'Confirmation'                => 'Auftragsbestätigung',
   'Contact'                     => 'Kontakt',
@@ -651,7 +649,6 @@ $self->{texts} = {
   'Delete Contact'              => 'Ansprechperson löschen',
   'Delete Dataset'              => 'Datenbank löschen',
   'Delete Shipto'               => 'Lieferadresse löschen',
-  'Delete delivery order'       => 'Lieferschein l&ouml;schen',
   'Delete drafts'               => 'Entwürfe löschen',
   'Delete links'                => 'Verknüpfungen löschen',
   'Delete profile'              => 'Profil löschen',
@@ -664,7 +661,7 @@ $self->{texts} = {
   'Delivery Order Date missing!' => 'Lieferscheindatum fehlt!',
   'Delivery Order Number'       => 'Lieferscheinnummer',
   'Delivery Order created'      => 'Lieferschein erstellt',
-  'Delivery Order deleted!'     => 'Lieferschein gel&ouml;scht!',
+  'Delivery Order deleted!'     => 'Lieferschein gelöscht!',
   'Delivery Orders'             => 'Lieferscheine',
   'Delivery Plan'               => 'Lieferplan',
   'Delivery Plan for currently outstanding sales orders' => 'Lieferplan für offene Verkaufsaufträge',
diff --git a/templates/webpages/do/delete.html b/templates/webpages/do/delete.html
deleted file mode 100644
index 252463e04..000000000
--- a/templates/webpages/do/delete.html
+++ /dev/null
@@ -1,21 +0,0 @@
-[%- USE T8 %]
-[%- USE HTML %][%- USE LxERP %]
-
- <div class="listtop">[% 'Delete delivery order' | $T8 %]</div>
-
- <form method="post" action="do.pl">
-
-  <h2 class="confirm">[% 'Confirm' | $T8 %]</h2>
-
-  <p>[% LxERP.t8('Are you sure you want to delete Delivery Order Number #1?', donumber) %]</p>
-
-  [%- FOREACH row = VARIABLES %]
-  <input type="hidden" name="[% HTML.escape(row.key) %]" value="[% HTML.escape(row.value) %]">
-  [%- END %]
-
-  <input type="hidden" name="yes_nextsub" value="delete_delivery_order">
-  <input type="hidden" name="no_nextsub" value="update">
-  <input name="action" class="submit" type="submit" value="[% 'Yes' | $T8 %]">
-  <input name="action" class="submit" type="submit" value="[% 'No' | $T8 %]">
- </form>
-
diff --git a/templates/webpages/do/form_footer.html b/templates/webpages/do/form_footer.html
index 20e6c2ade..d02a1e52d 100644
--- a/templates/webpages/do/form_footer.html
+++ b/templates/webpages/do/form_footer.html
@@ -1,5 +1,5 @@
 [%- USE T8 %]
-[% USE HTML %][% USE LxERP %]
+[% USE HTML %][% USE LxERP %][%- USE L -%]
  [%- IF delivered %]
  [%- SET RO = ' readonly' %]
  [%- END %]
@@ -93,7 +93,7 @@
    [% 'Workflow Delivery Order' | $T8 %]<br>
    <input class="submit" type="submit" name="action_save_as_new" value="[% 'Save as new' | $T8 %]">
    [% UNLESS delivered || (vc == 'customer' && !INSTANCE_CONF.get_sales_delivery_order_show_delete) || (vc == 'vendor' && !INSTANCE_CONF.get_purchase_delivery_order_show_delete) %]
-     <input class="submit" type="submit" name="action_delete" value="[% 'Delete' | $T8 %]">
+    [% L.submit_tag('action_delete', LxERP.t8('Delete'), confirm=LxERP.t8('Are you sure?')) %]
    [% END %]
    <input class="submit" type="submit" name="action_invoice" value="[% 'Invoice' | $T8 %]">
   </p>
-- 
2.20.1