neuen Artikel aus Angebots-/Auftrags-Maske anlegen: Variable besser benannt

diff --git a/SL/Controller/DeliveryOrder.pm b/SL/Controller/DeliveryOrder.pm
index 97bfbca3ea97484847fff42bdfd135845c119ab2..7c4a99bfa3d65cfadb8476e1d7dacd5fa2637a2a 100644 (file)
--- a/SL/Controller/DeliveryOrder.pm
+++ b/SL/Controller/DeliveryOrder.pm
@@ -861,11 +861,11 @@ sub action_create_part {
   flash_later('info', t8('You are adding a new part while you are editing another document. You will be redirected to your document when saving the new part or aborting this form.'));
 
   my @redirect_params = (
   flash_later('info', t8('You are adding a new part while you are editing another document. You will be redirected to your document when saving the new part or aborting this form.'));
 
   my @redirect_params = (

-    controller => 'Part',
-    action     => 'add',
-    part_type  => $::form->{add_item}->{create_part_type},
-    callback   => $callback,
-    show_abort => 1,
+    controller    => 'Part',
+    action        => 'add',
+    part_type     => $::form->{add_item}->{create_part_type},
+    callback      => $callback,
+    inline_create => 1,

   );
 
   $self->redirect_to(@redirect_params);
   );
 
   $self->redirect_to(@redirect_params);

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index e5313124de1097d05a4cd4c340361d818c61f0de..9454a1e132368c098cf44df35a79e81cf2565f73 100644 (file)
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -1165,11 +1165,11 @@ sub action_create_part {
   flash_later('info', t8('You are adding a new part while you are editing another document. You will be redirected to your document when saving the new part or aborting this form.'));
 
   my @redirect_params = (
   flash_later('info', t8('You are adding a new part while you are editing another document. You will be redirected to your document when saving the new part or aborting this form.'));
 
   my @redirect_params = (

-    controller => 'Part',
-    action     => 'add',
-    part_type  => $::form->{add_item}->{create_part_type},
-    callback   => $callback,
-    show_abort => 1,
+    controller    => 'Part',
+    action        => 'add',
+    part_type     => $::form->{add_item}->{create_part_type},
+    callback      => $callback,
+    inline_create => 1,

   );
 
   $self->redirect_to(@redirect_params);
   );
 
   $self->redirect_to(@redirect_params);

diff --git a/SL/Controller/Part.pm b/SL/Controller/Part.pm
index d2638fb7e53e437a0ff3d802f7a2ef4f493bdffc..b15b0ad4772bc86ec1cc5d53381b236be6e304aa 100644 (file)
--- a/SL/Controller/Part.pm
+++ b/SL/Controller/Part.pm
@@ -1349,7 +1349,7 @@ sub _setup_form_action_bar {
       action => [
         t8('Abort'),
         submit   => [ '#ic', { action => "Part/abort" } ],
       action => [
         t8('Abort'),
         submit   => [ '#ic', { action => "Part/abort" } ],

-        only_if  => !!$::form->{show_abort},
+        only_if  => !!$::form->{inline_create},

       ],
 
       action => [
       ],
 
       action => [