Order: Workflow Beistelllieferschein erstellen

diff --git a/SL/Controller/DeliveryOrder.pm b/SL/Controller/DeliveryOrder.pm
index 65334254906c6f5c96f797fd365762fd129b9286..3878e5a6465afcfdfa8aaf3135900da0b4c6e160 100644 (file)
--- a/SL/Controller/DeliveryOrder.pm
+++ b/SL/Controller/DeliveryOrder.pm
@@ -78,6 +78,16 @@ sub action_add {
   );
 }
 
   );
 }
 

+sub action_add_from_order {
+  my ($self) = @_;
+  # this interfers with init_order
+  $self->{converted_from_oe_id} = delete $::form->{id};
+
+  # TODO copy data and remember to link them on save
+
+  $self->action_add;
+}
+

 # edit an existing order
 sub action_edit {
   my ($self) = @_;
 # edit an existing order
 sub action_edit {
   my ($self) = @_;

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index b4328a1e23cdb1cd5d3276c9362e0fd9057f285c..524d9045baa31d683b330fe03ae6bddb4bd0594f 100644 (file)
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -677,6 +677,16 @@ sub action_save_and_delivery_order {
   );
 }
 
   );
 }
 

+sub action_save_and_supplier_delivery_order {
+  my ($self) = @_;
+
+  $self->save_and_redirect_to(
+    controller => 'controller.pl',
+    action     => 'DeliveryOrder/add_from_order',
+    type       => 'supplier_delivery_order',
+  );
+}
+

 # save the order and redirect to the frontend subroutine for a new
 # invoice
 sub action_save_and_invoice {
 # save the order and redirect to the frontend subroutine for a new
 # invoice
 sub action_save_and_invoice {


@@ -2065,6 +2075,16 @@ sub setup_edit_action_bar {
           ],
           only_if   => (any { $self->type eq $_ } (sales_order_type(), purchase_order_type()))
         ],
           ],
           only_if   => (any { $self->type eq $_ } (sales_order_type(), purchase_order_type()))
         ],

+        action => [
+          t8('Save and Supplier Delivery Order'),
+          call      => [ 'kivi.Order.save', 'save_and_supplier_delivery_order', $::instance_conf->get_order_warn_duplicate_parts,
+                                                                       $::instance_conf->get_order_warn_no_deliverydate,
+                                                                                                                        ],
+          checks    => [ 'kivi.Order.check_save_active_periodic_invoices',
+                         @req_trans_cost_art, @req_cusordnumber,
+          ],
+          only_if   => (any { $self->type eq $_ } (sales_order_type()))
+        ],

         action => [
           t8('Save and Invoice'),
           call      => [ 'kivi.Order.save', 'save_and_invoice', $::instance_conf->get_order_warn_duplicate_parts ],
         action => [
           t8('Save and Invoice'),
           call      => [ 'kivi.Order.save', 'save_and_invoice', $::instance_conf->get_order_warn_duplicate_parts ],