Pflichtenhefte: Löschen von Aufträgen/Angeboten

diff --git a/SL/Controller/RequirementSpecOrder.pm b/SL/Controller/RequirementSpecOrder.pm
index 6dfab604b753891c3ad75a4c479b58bf5241ace4..e444a7cc99b35d19f9b4b66ad5e505df4b30fa2e 100644 (file)
--- a/SL/Controller/RequirementSpecOrder.pm
+++ b/SL/Controller/RequirementSpecOrder.pm
@@ -154,6 +154,20 @@ sub action_save_assignment {
            ->render($self);
 }
 
            ->render($self);
 }
 

+sub action_delete {
+  my ($self) = @_;
+
+  my $order  = $self->rs_order->order;
+
+  $order->delete;
+  $self->init_requirement_spec;
+
+  my $html = $self->render('requirement_spec_order/list', { output => 0 });
+  $self->js->html('#' . TAB_ID(), $html)
+           ->flash('info', $order->quotation ? t8('Sales quotation #1 has been deleted.', $order->quonumber) : t8('Sales order #1 has been deleted.', $order->ordnumber))
+           ->render($self);
+}
+

 sub action_cancel {
   my ($self) = @_;
 
 sub action_cancel {
   my ($self) = @_;
 

diff --git a/js/requirement_spec.js b/js/requirement_spec.js
index 6ea5329cadd3702db5be1b4b1aedd023318bcc96..160240df41d9e62331f8094517e47ff4e7fa51f1 100644 (file)
--- a/js/requirement_spec.js
+++ b/js/requirement_spec.js
@@ -344,6 +344,12 @@ ns.standard_quotation_order_ajax_call = function(key, opt) {
   return true;
 };
 
   return true;
 };
 

+ns.ask_delete_quotation_order = function(key, opt) {
+  if (confirm(kivi.t8("Are you sure?")))
+    ns.standard_quotation_order_ajax_call(key, opt);
+  return true;
+};
+

 ns.disable_edit_quotation_order_commands = function(key, opt) {
   return ns.find_quotation_order_id(opt.$trigger) == undefined;
 };
 ns.disable_edit_quotation_order_commands = function(key, opt) {
   return ns.find_quotation_order_id(opt.$trigger) == undefined;
 };

diff --git a/locale/de/all b/locale/de/all
index af60767a2d7d21f7a80dbfcb0de22b01334164db..71e9ba0ee1bbb8c807d70eb93992127bdf883621 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1955,11 +1955,13 @@ $self->{texts} = {
   'Sales margin %'              => 'Marge prozentual',
   'Sales net amount'            => 'VK-Betrag',
   'Sales order #1 has been created.' => 'Kundenauftrag #1 wurde angelegt.',
   'Sales margin %'              => 'Marge prozentual',
   'Sales net amount'            => 'VK-Betrag',
   'Sales order #1 has been created.' => 'Kundenauftrag #1 wurde angelegt.',

+  'Sales order #1 has been deleted.' => 'Kundenauftrag #1 wurde gelöscht.',

   'Sales order #1 has been updated.' => 'Kundenauftrag #1 wurde aktualisiert.',
   'Sales price'                 => 'VK-Preis',
   'Sales price total'           => 'VK-Betrag',
   'Sales quotation'             => 'Angebot',
   'Sales quotation #1 has been created.' => 'Angebot #1 wurde angelegt.',
   'Sales order #1 has been updated.' => 'Kundenauftrag #1 wurde aktualisiert.',
   'Sales price'                 => 'VK-Preis',
   'Sales price total'           => 'VK-Betrag',
   'Sales quotation'             => 'Angebot',
   'Sales quotation #1 has been created.' => 'Angebot #1 wurde angelegt.',

+  'Sales quotation #1 has been deleted.' => 'Angebot #1 wurde gelöscht.',

   'Sales quotation #1 has been updated.' => 'Angebot #1 wurde aktualisiert.',
   'Salesman'                    => 'Verkäufer/in',
   'Salesman (database ID)'      => 'Verkäufer (Datenbank-ID)',
   'Sales quotation #1 has been updated.' => 'Angebot #1 wurde aktualisiert.',
   'Salesman'                    => 'Verkäufer/in',
   'Salesman (database ID)'      => 'Verkäufer (Datenbank-ID)',