Changed to gender-free email salutation and replacing "versand" with accurate spellin...

[mfinanz.git] / SL / Controller / Order.pm

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index ace7accba5d000c733f6cadb8d87763c5485f856..d4395b5f9238b42e89e164a514a1071974ab402b 100644 (file)
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -1472,7 +1472,9 @@ sub _setup_edit_action_bar {
       combobox => [
         action => [
           t8('Save'),
       combobox => [
         action => [
           t8('Save'),

-          call      => [ 'kivi.Order.save', 'save', $::instance_conf->get_order_warn_duplicate_parts ],
+          call      => [ 'kivi.Order.save', 'save', $::instance_conf->get_order_warn_duplicate_parts,
+                                                    $::instance_conf->get_order_warn_no_deliverydate,
+                                                                                                      ],

           checks    => [ 'kivi.Order.check_save_active_periodic_invoices' ],
         ],
         action => [
           checks    => [ 'kivi.Order.check_save_active_periodic_invoices' ],
         ],
         action => [


@@ -1483,7 +1485,9 @@ sub _setup_edit_action_bar {
         ],
         action => [
           t8('Save and Delivery Order'),
         ],
         action => [
           t8('Save and Delivery Order'),

-          call      => [ 'kivi.Order.save', 'save_and_delivery_order', $::instance_conf->get_order_warn_duplicate_parts ],
+          call      => [ 'kivi.Order.save', 'save_and_delivery_order', $::instance_conf->get_order_warn_duplicate_parts,
+                                                                       $::instance_conf->get_order_warn_no_deliverydate,
+                                                                                                                        ],

           checks    => [ 'kivi.Order.check_save_active_periodic_invoices' ],
           only_if   => (any { $self->type eq $_ } (_sales_order_type(), _purchase_order_type()))
         ],
           checks    => [ 'kivi.Order.check_save_active_periodic_invoices' ],
           only_if   => (any { $self->type eq $_ } (_sales_order_type(), _purchase_order_type()))
         ],