From 7715064f04ff1af8e2baec72ec7b8c68f7805a6b Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 24 May 2007 14:14:11 +0000
Subject: [PATCH] =?utf8?q?Durch=20einen=20der=20letzten=20Commits=20wurde?=
 =?utf8?q?=20die=20Funktion=20"yes"=20=C3=BCberschrieben.=20Die=20Ursprung?=
 =?utf8?q?sfunktion=20wurde=20umbenannt.=20Sie=20wird=20nun=20aus=20der=20?=
 =?utf8?q?neuen=20"yes"=20aufrufen.=20Fix=20f=C3=BCr=20Bug=20656.=20Zus?=
 =?utf8?q?=C3=A4tzlich=20gibt=20es=20bei=20der=20R=C3=BCckfrage,=20ob=20ei?=
 =?utf8?q?n=20Angebot/ein=20Auftrag=20gel=C3=B6scht=20werden=20soll,=20ein?=
 =?utf8?q?en=20Button=20"Nein".?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 bin/mozilla/oe.pl | 8 ++++++--
 locale/de/oe      | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index a6ea2ee24..e03e83eb1 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -2122,8 +2122,11 @@ sub delete {
 
 <h4>$msg $form->{$ordnumber}</h4>
 <p>
+<input type="hidden" name="yes_nextsub" value="delete_order_quotation">
 <input name=action class=submit type=submit value="|
     . $locale->text('Yes') . qq|">
+<input name=action class=submit type=submit onclick="history.back()" value="|
+    . $locale->text('No') . qq|">
 </form>
 
 </body>
@@ -2133,7 +2136,7 @@ sub delete {
   $lxdebug->leave_sub();
 }
 
-sub yes {
+sub delete_order_quotation {
   $lxdebug->enter_sub();
 
   if ($form->{type} =~ /_order$/) {
@@ -2144,7 +2147,6 @@ sub yes {
     $err = $locale->text('Cannot delete quotation!');
   }
   if (OE->delete(\%myconfig, \%$form, $spool)){
-    $form->redirect($msg);
     # saving the history
     if(!exists $form->{addition}) {
       $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
@@ -2152,6 +2154,8 @@ sub yes {
   	  $form->save_history($form->dbconnect(\%myconfig));
     }
     # /saving the history 
+    $form->info($msg);
+    exit();
   }
   $form->error($err);
 
diff --git a/locale/de/oe b/locale/de/oe
index 64b8d9fab..4e638b722 100644
--- a/locale/de/oe
+++ b/locale/de/oe
@@ -294,6 +294,7 @@ $self->{subs} = {
   'create_backorder'            => 'create_backorder',
   'customer_details'            => 'customer_details',
   'delete'                      => 'delete',
+  'delete_order_quotation'      => 'delete_order_quotation',
   'delivery_customer_selection' => 'delivery_customer_selection',
   'display_form'                => 'display_form',
   'display_row'                 => 'display_row',
-- 
2.39.5