From 85693e13660f80e5116e571ccac7199a680817c9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20B=C3=BCren?= Date: Wed, 5 May 2021 16:40:18 +0200 Subject: [PATCH] Order: Warnung/Fehler bei Liefertermin auch bei kombinierten Export-Aktionen --- SL/Controller/Order.pm | 8 ++++++-- js/kivi.Order.js | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm index fa5c4c364..5a7d58eb8 100644 --- a/SL/Controller/Order.pm +++ b/SL/Controller/Order.pm @@ -1898,12 +1898,16 @@ sub setup_edit_action_bar { ], 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', - 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 => [ diff --git a/js/kivi.Order.js b/js/kivi.Order.js index 714a40e53..75e7d2de6 100644 --- 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); }; - 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; -- 2.20.1