Order: Warnung/Fehler bei Liefertermin auch bei kombinierten Export-Aktionen

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index fa5c4c364bce79f110ddd06b3101953b553028a0..5a7d58eb8ba55bc0ad9b52106ef9a4d74fc4922c 100644 (file)
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -1898,12 +1898,16 @@ sub setup_edit_action_bar {
         ],
         action => [
           t8('Save and print'),
         ],
         action => [
           t8('Save and print'),

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

         ],
         action => [
           t8('Save and E-mail'),
           id   => 'save_and_email_action',
         ],
         action => [
           t8('Save and E-mail'),
           id   => 'save_and_email_action',

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

           disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef,
         ],
         action => [
           disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef,
         ],
         action => [

diff --git a/js/kivi.Order.js b/js/kivi.Order.js
index 714a40e53d3f90b5e9a85c3b314df6ec72919d9f..75e7d2de6995b5dcd42a195938f5f09b227aa62f 100644 (file)
--- a/js/kivi.Order.js
+++ b/js/kivi.Order.js
@@ -63,7 +63,7 @@ namespace('kivi.Order', function(ns) {
     $.post("controller.pl", data, kivi.eval_json_result);
   };
 
     $.post("controller.pl", data, kivi.eval_json_result);
   };
 

-  ns.show_print_options = function(warn_on_duplicates) {
+  ns.show_print_options = function(warn_on_duplicates, warn_on_reqdate) {

     if (!ns.check_cv()) return;
     if (warn_on_duplicates && !ns.check_duplicate_parts(kivi.t8("Do you really want to print?"))) return;
 
     if (!ns.check_cv()) return;
     if (warn_on_duplicates && !ns.check_duplicate_parts(kivi.t8("Do you really want to print?"))) return;