X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/00402ae67e8b4edf686585752a2193da8ecfc169..8fdb9983021ac73551052681d3a9d69514447a58:/js/kivi.Order.js

diff --git a/js/kivi.Order.js b/js/kivi.Order.js
index b6a9642e5..298a8b51b 100644
--- a/js/kivi.Order.js
+++ b/js/kivi.Order.js
@@ -35,9 +35,19 @@ namespace('kivi.Order', function(ns) {
     return true;
   };
 
-  ns.save = function(action, warn_on_duplicates) {
+  ns.check_valid_reqdate = function() {
+    if ($('#order_reqdate').val() === '') {
+      alert(kivi.t8('Please select a delivery date.'));
+      return false;
+    } else {
+      return true;
+    }
+  };
+
+  ns.save = function(action, warn_on_duplicates, warn_on_reqdate) {
     if (!ns.check_cv()) return;
     if (warn_on_duplicates && !ns.check_save_duplicate_parts()) return;
+    if (warn_on_reqdate    && !ns.check_valid_reqdate()) return;
 
     var data = $('#order_form').serializeArray();
     data.push({ name: 'action', value: 'Order/' + action });
@@ -450,6 +460,7 @@ namespace('kivi.Order', function(ns) {
   };
 
   ns.price_chooser_item_row = function(clicked) {
+    if (!ns.check_cv()) return;
     var row = $(clicked).parents("tbody").first();
     var item_id_dom = $(row).find('[name="orderitem_ids[+]"]');
 
@@ -626,9 +637,9 @@ namespace('kivi.Order', function(ns) {
   ns.show_calculate_qty_dialog = function(clicked) {
     var row = $(clicked).parents("tbody").first();
     var input_id = $(row).find('[name="order.orderitems[].qty_as_number"]').attr('id');
-    var formula_id = $(row).find('[name="formula"]').attr('id');
+    var formula_id = $(row).find('[name="formula[+]"]').attr('id');
 
-    calculate_qty_selection_window("", input_id, "", formula_id);
+    calculate_qty_selection_dialog("", input_id, "", formula_id);
     return true;
   }