PartPicker nach Kunden- und Lieferanten-Artikel-Nr. suchen und filtern können

[mfinanz.git] / js / kivi.Order.js

diff --git a/js/kivi.Order.js b/js/kivi.Order.js
index b6a9642e50c9f42018b2c27bbbd162ee3baf4b18..e7815d497d652275d2b9736c43fa2685738425f1 100644 (file)
--- a/js/kivi.Order.js
+++ b/js/kivi.Order.js
@@ -1,6 +1,6 @@
 namespace('kivi.Order', function(ns) {
   ns.check_cv = function() {
 namespace('kivi.Order', function(ns) {
   ns.check_cv = function() {

-    if ($('#type').val() == 'sales_order' || $('#type').val() == 'sales_quotation' ) {
+    if ($('#type').val() == 'sales_order' || $('#type').val() == 'sales_quotation') {

       if ($('#order_customer_id').val() === '') {
         alert(kivi.t8('Please select a customer.'));
         return false;
       if ($('#order_customer_id').val() === '') {
         alert(kivi.t8('Please select a customer.'));
         return false;


@@ -14,8 +14,8 @@ namespace('kivi.Order', function(ns) {
     return true;
   };
 
     return true;
   };
 

-  ns.check_save_duplicate_parts = function() {
-    var id_arr = $('[name="order.orderitems[].parts_id"]').map(function() {return this.value;}).get();
+  ns.check_duplicate_parts = function(question) {
+    var id_arr = $('[name="order.orderitems[].parts_id"]').map(function() { return this.value; }).get();

 
     var i, obj = {}, pos = [];
 
 
     var i, obj = {}, pos = [];
 


@@ -28,16 +28,27 @@ namespace('kivi.Order', function(ns) {
     }
 
     if (pos.length > 0) {
     }
 
     if (pos.length > 0) {

+      question = question || kivi.t8("Do you really want to save?");

       return confirm(kivi.t8("There are duplicate parts at positions") + "\n"
                      + pos.join(', ') + "\n"
       return confirm(kivi.t8("There are duplicate parts at positions") + "\n"
                      + pos.join(', ') + "\n"

-                     + kivi.t8("Do you really want to save?"));
+                     + question);

     }
     return true;
   };
 
     }
     return true;
   };
 

-  ns.save = function(action, warn_on_duplicates) {
+  ns.check_valid_reqdate = function() {
+    if ($('#order_reqdate_as_date').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 (!ns.check_cv()) return;

-    if (warn_on_duplicates && !ns.check_save_duplicate_parts()) return;
+    if (warn_on_duplicates && !ns.check_duplicate_parts()) return;
+    if (warn_on_reqdate    && !ns.check_valid_reqdate())   return;

 
     var data = $('#order_form').serializeArray();
     data.push({ name: 'action', value: 'Order/' + action });
 
     var data = $('#order_form').serializeArray();
     data.push({ name: 'action', value: 'Order/' + action });


@@ -52,8 +63,9 @@ 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() {
+  ns.show_print_options = function(warn_on_duplicates) {

     if (!ns.check_cv()) return;
     if (!ns.check_cv()) return;

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

 
     kivi.popup_dialog({
       id: 'print_options',
 
     kivi.popup_dialog({
       id: 'print_options',


@@ -76,16 +88,17 @@ namespace('kivi.Order', function(ns) {
   };
 
   ns.download_pdf = function(pdf_filename, key) {
   };
 
   ns.download_pdf = function(pdf_filename, key) {

-    var data = [];
-    data.push({ name: 'action', value: 'Order/download_pdf' });
-    data.push({ name: 'type', value: $('#type').val() });
-    data.push({ name: 'pdf_filename', value: pdf_filename });
-    data.push({ name: 'key', value: key });
+    var data = [{ name: 'action',       value: 'Order/download_pdf' },
+                { name: 'type',         value: $('#type').val()     },
+                { name: 'pdf_filename', value: pdf_filename         },
+                { name: 'key',          value: key                  }];

     $.download("controller.pl", data);
   };
 
     $.download("controller.pl", data);
   };
 

-  ns.email = function() {
+  ns.email = function(warn_on_duplicates) {
+    if (warn_on_duplicates && !ns.check_duplicate_parts(kivi.t8("Do you really want to send by mail?"))) return;

     if (!ns.check_cv()) return;
     if (!ns.check_cv()) return;

+

     var data = $('#order_form').serializeArray();
     data.push({ name: 'action', value: 'Order/show_email_dialog' });
 
     var data = $('#order_form').serializeArray();
     data.push({ name: 'action', value: 'Order/show_email_dialog' });
 


@@ -173,25 +186,25 @@ namespace('kivi.Order', function(ns) {
   };
 
   ns.unit_change = function(event) {
   };
 
   ns.unit_change = function(event) {

-    var row = $(event.target).parents("tbody").first();
-    var item_id_dom = $(row).find('[name="orderitem_ids[+]"]');
+    var row           = $(event.target).parents("tbody").first();
+    var item_id_dom   = $(row).find('[name="orderitem_ids[+]"]');

     var sellprice_dom = $(row).find('[name="order.orderitems[].sellprice_as_number"]');
     var sellprice_dom = $(row).find('[name="order.orderitems[].sellprice_as_number"]');

-    var select_elt = $(row).find('[name="order.orderitems[].unit"]');
+    var select_elt    = $(row).find('[name="order.orderitems[].unit"]');

 
     var oldval = $(select_elt).data('oldval');
     $(select_elt).data('oldval', $(select_elt).val());
 
     var data = $('#order_form').serializeArray();
 
     var oldval = $(select_elt).data('oldval');
     $(select_elt).data('oldval', $(select_elt).val());
 
     var data = $('#order_form').serializeArray();

-    data.push({ name: 'action', value: 'Order/unit_changed' });
-    data.push({ name: 'item_id', value: item_id_dom.val() });
-    data.push({ name: 'old_unit', value: oldval });
-    data.push({ name: 'sellprice_dom_id', value: sellprice_dom.attr('id') });
+    data.push({ name: 'action',           value: 'Order/unit_changed'     },
+              { name: 'item_id',          value: item_id_dom.val()        },
+              { name: 'old_unit',         value: oldval                   },
+              { name: 'sellprice_dom_id', value: sellprice_dom.attr('id') });

 
     $.post("controller.pl", data, kivi.eval_json_result);
   };
 
   ns.update_sellprice = function(item_id, price_str) {
 
     $.post("controller.pl", data, kivi.eval_json_result);
   };
 
   ns.update_sellprice = function(item_id, price_str) {

-    var row = $('#item_' + item_id).parents("tbody").first();
+    var row       = $('#item_' + item_id).parents("tbody").first();

     var price_elt = $(row).find('[name="order.orderitems[].sellprice_as_number"]');
     var html_elt  = $(row).find('[name="sellprice_text"]');
     price_elt.val(price_str);
     var price_elt = $(row).find('[name="order.orderitems[].sellprice_as_number"]');
     var html_elt  = $(row).find('[name="sellprice_text"]');
     price_elt.val(price_str);


@@ -200,14 +213,14 @@ namespace('kivi.Order', function(ns) {
 
   ns.load_second_row = function(row) {
     var item_id_dom = $(row).find('[name="orderitem_ids[+]"]');
 
   ns.load_second_row = function(row) {
     var item_id_dom = $(row).find('[name="orderitem_ids[+]"]');

-    var div_elt = $(row).find('[name="second_row"]');
+    var div_elt     = $(row).find('[name="second_row"]');

 
     if ($(div_elt).data('loaded') == 1) {
       return;
     }
     var data = $('#order_form').serializeArray();
 
     if ($(div_elt).data('loaded') == 1) {
       return;
     }
     var data = $('#order_form').serializeArray();

-    data.push({ name: 'action', value: 'Order/load_second_rows' });
-    data.push({ name: 'item_ids[]', value: item_id_dom.val() });
+    data.push({ name: 'action',     value: 'Order/load_second_rows' },
+              { name: 'item_ids[]', value: item_id_dom.val()        });

 
     $.post("controller.pl", data, kivi.eval_json_result);
   };
 
     $.post("controller.pl", data, kivi.eval_json_result);
   };


@@ -275,18 +288,19 @@ namespace('kivi.Order', function(ns) {
 
     kivi.run_once_for('.row_entry', 'on_kbd_click_show_hide', function(elt) {
       $(elt).keydown(function(event) {
 
     kivi.run_once_for('.row_entry', 'on_kbd_click_show_hide', function(elt) {
       $(elt).keydown(function(event) {

-        if(event.keyCode == 40 && event.shiftKey === true) {
+        var row;
+        if (event.keyCode == 40 && event.shiftKey === true) {

           // shift arrow down
           event.preventDefault();
           // shift arrow down
           event.preventDefault();

-          var row = $(event.target).parents(".row_entry").first();
+          row = $(event.target).parents(".row_entry").first();

           ns.load_second_row(row);
           ns.show_second_row(row);
           return false;
         }
           ns.load_second_row(row);
           ns.show_second_row(row);
           return false;
         }

-        if(event.keyCode == 38 && event.shiftKey === true) {
+        if (event.keyCode == 38 && event.shiftKey === true) {

           // shift arrow up
           event.preventDefault();
           // shift arrow up
           event.preventDefault();

-          var row = $(event.target).parents(".row_entry").first();
+          row = $(event.target).parents(".row_entry").first();

           ns.hide_second_row(row);
           return false;
         }
           ns.hide_second_row(row);
           return false;
         }


@@ -342,9 +356,9 @@ namespace('kivi.Order', function(ns) {
     $('#' + order_by + '_header_id a').append('<img border=0 data-sort-dir=' + dir + ' src=' + src + ' alt="' + kivi.t8('sort items') + '">');
 
     var data = $('#order_form').serializeArray();
     $('#' + order_by + '_header_id a').append('<img border=0 data-sort-dir=' + dir + ' src=' + src + ' alt="' + kivi.t8('sort items') + '">');
 
     var data = $('#order_form').serializeArray();

-    data.push({ name: 'action', value: 'Order/reorder_items' });
-    data.push({ name: 'order_by', value: order_by });
-    data.push({ name: 'sort_dir', value: dir });
+    data.push({ name: 'action',   value: 'Order/reorder_items' },
+              { name: 'order_by', value: order_by              },
+              { name: 'sort_dir', value: dir                   });

 
     $.post("controller.pl", data, kivi.eval_json_result);
   };
 
     $.post("controller.pl", data, kivi.eval_json_result);
   };


@@ -371,19 +385,30 @@ namespace('kivi.Order', function(ns) {
     $.post("controller.pl", data, kivi.eval_json_result);
   };
 
     $.post("controller.pl", data, kivi.eval_json_result);
   };
 

+  ns.setup_multi_items_dialog = function() {
+    $('#multi_items_filter_table input, #multi_items_filter_table select').keydown(function(event) {
+      if (event.keyCode == 13) {
+        event.preventDefault();
+        ns.multi_items_dialog_update_result();
+        return false;
+      }
+    });
+
+    $('#multi_items_filter_all_substr_multi_ilike').focus();
+  };
+

   ns.show_multi_items_dialog = function() {
     if (!ns.check_cv()) return;
 
     $('#row_table_id thead a img').remove();
 
     kivi.popup_dialog({
   ns.show_multi_items_dialog = function() {
     if (!ns.check_cv()) return;
 
     $('#row_table_id thead a img').remove();
 
     kivi.popup_dialog({

-      url: 'controller.pl?action=Order/show_multi_items_dialog',
-      data: { type: $('#type').val(),
-              callback: 'Order/add_multi_items',
-              callback_data_id: 'order_form' },
-      id: 'jq_multi_items_dialog',
+      url:    'controller.pl?action=Order/show_multi_items_dialog',
+      data:   { type: $('#type').val() },
+      id:     'jq_multi_items_dialog',
+      load:   kivi.Order.setup_multi_items_dialog,

       dialog: {
       dialog: {

-        title: kivi.t8('Add multiple items'),
+        title:  kivi.t8('Add multiple items'),

         width:  800,
         height: 500
       }
         width:  800,
         height: 500
       }


@@ -395,6 +420,73 @@ namespace('kivi.Order', function(ns) {
     $('#jq_multi_items_dialog').dialog('close');
   };
 
     $('#jq_multi_items_dialog').dialog('close');
   };
 

+  ns.multi_items_dialog_update_result = function() {
+    var data = $('#multi_items_form').serializeArray();
+    data.push({ name: 'type', value: $('#type').val() });
+    $.ajax({
+      url:     'controller.pl?action=Order/multi_items_update_result',
+      data:    data,
+      method:  'post',
+      success: function(data) {
+        $('#multi_items_result').html(data);
+        ns.multi_items_dialog_enable_continue();
+        ns.multi_items_result_setup_events();
+      }
+    });
+  };
+
+  ns.multi_items_dialog_disable_continue = function() {
+    // disable keydown-event and continue button to prevent
+    // impatient users to add parts multiple times
+    $('#multi_items_result input').off("keydown");
+    $('#multi_items_dialog_continue_button').prop('disabled', true);
+  };
+
+  ns.multi_items_dialog_enable_continue = function()  {
+    $('#multi_items_result input').keydown(function(event) {
+      if(event.keyCode == 13) {
+        event.preventDefault();
+        ns.add_multi_items();
+        return false;
+      }
+    });
+    $('#multi_items_dialog_continue_button').prop('disabled', false);
+  };
+
+  ns.multi_items_result_setup_events = function() {
+    $('#multi_items_all_qty').change(ns.reformat_number);
+    $('#multi_items_all_qty').change(function(event) {
+      $('.multi_items_qty').val($(event.target).val());
+    });
+    $('.multi_items_qty').change(ns.reformat_number);
+  }
+
+  ns.add_multi_items = function() {
+    // rows at all
+    var n_rows = $('.multi_items_qty').length;
+    if (n_rows == 0) return;
+
+    // filled rows
+    n_rows = $('.multi_items_qty').filter(function() {
+      return $(this).val().length > 0;
+    }).length;
+    if (n_rows == 0) return;
+
+    ns.multi_items_dialog_disable_continue();
+
+    var data = $('#order_form').serializeArray();
+    data = data.concat($('#multi_items_form').serializeArray());
+    data.push({ name: 'action', value: 'Order/add_multi_items' });
+    $.post("controller.pl", data, kivi.eval_json_result);
+  };
+
+  ns.set_input_to_one = function(clicked) {
+    if ($(clicked).val() == '') {
+      $(clicked).val(kivi.format_amount(1.00, -2));
+    }
+    $(clicked).select();
+  };
+

   ns.delete_order_item_row = function(clicked) {
     var row = $(clicked).parents("tbody").first();
     $(row).remove();
   ns.delete_order_item_row = function(clicked) {
     var row = $(clicked).parents("tbody").first();
     $(row).remove();


@@ -408,27 +500,29 @@ namespace('kivi.Order', function(ns) {
   };
 
   ns.show_longdescription_dialog = function(clicked) {
   };
 
   ns.show_longdescription_dialog = function(clicked) {

-    var row = $(clicked).parents("tbody").first();
-    var position = $(row).find('[name="position"]').html();
-    var partnumber = $(row).find('[name="partnumber"]').html();
-    var description_elt = $(row).find('[name="order.orderitems[].description"]');
-    var description = description_elt.val();
+    var row                 = $(clicked).parents("tbody").first();
+    var position            = $(row).find('[name="position"]').html();
+    var partnumber          = $(row).find('[name="partnumber"]').html();
+    var description_elt     = $(row).find('[name="order.orderitems[].description"]');
+    var description         = description_elt.val();

     var longdescription_elt = $(row).find('[name="order.orderitems[].longdescription"]');
     var longdescription;
 
     if (!longdescription_elt.length) {
     var longdescription_elt = $(row).find('[name="order.orderitems[].longdescription"]');
     var longdescription;
 
     if (!longdescription_elt.length) {

-      var data = [];
-      data.push({ name: 'action', value: 'Order/get_item_longdescription' });
-      data.push({ name: 'type', value: $('#type').val() });
-      data.push({ name: 'item_id', value: $(row).find('[name="order.orderitems[+].id"]').val() });
-      data.push({ name: 'parts_id', value: $(row).find('[name="order.orderitems[].parts_id"]').val() });
+      var data = [
+        { name: 'action',   value: 'Order/get_item_longdescription'                          },
+        { name: 'type',     value: $('#type').val()                                          },
+        { name: 'item_id',  value: $(row).find('[name="order.orderitems[+].id"]').val()      },
+        { name: 'parts_id', value: $(row).find('[name="order.orderitems[].parts_id"]').val() }
+      ];
+

       $.ajax({
       $.ajax({

-        url: 'controller.pl',
-        data: data,
-        method: "GET",
-        async: false,
+        url:      'controller.pl',
+        data:     data,
+        method:   "GET",
+        async:    false,

         dataType: 'text',
         dataType: 'text',

-        success: function(val){
+        success:  function(val) {

           longdescription = val;
         }
       });
           longdescription = val;
         }
       });


@@ -436,39 +530,41 @@ namespace('kivi.Order', function(ns) {
       longdescription = longdescription_elt.val();
     }
 
       longdescription = longdescription_elt.val();
     }
 

-    var params = { runningnumber: position,
-                   partnumber: partnumber,
-                   description: description,
-                   default_longdescription: longdescription,
-                   set_function: function(val){
-                     longdescription_elt.remove();
-                     $('<input type="hidden" name="order.orderitems[].longdescription">').insertAfter(description_elt).val(val);
-                   }
-                 };
+    var params = {
+      runningnumber:           position,
+      partnumber:              partnumber,
+      description:             description,
+      default_longdescription: longdescription,
+      set_function:            function(val) {
+        longdescription_elt.remove();
+        $('<input type="hidden" name="order.orderitems[].longdescription">').insertAfter(description_elt).val(val);
+      }
+    };

 
     kivi.SalesPurchase.edit_longdescription_with_params(params);
   };
 
   ns.price_chooser_item_row = function(clicked) {
 
     kivi.SalesPurchase.edit_longdescription_with_params(params);
   };
 
   ns.price_chooser_item_row = function(clicked) {

-    var row = $(clicked).parents("tbody").first();
+    if (!ns.check_cv()) return;
+    var row         = $(clicked).parents("tbody").first();

     var item_id_dom = $(row).find('[name="orderitem_ids[+]"]');
 
     var data = $('#order_form').serializeArray();
     var item_id_dom = $(row).find('[name="orderitem_ids[+]"]');
 
     var data = $('#order_form').serializeArray();

-    data.push({ name: 'action', value: 'Order/price_popup' });
-    data.push({ name: 'item_id', value: item_id_dom.val() });
+    data.push({ name: 'action',  value: 'Order/price_popup' },
+              { name: 'item_id', value: item_id_dom.val()   });

 
     $.post("controller.pl", data, kivi.eval_json_result);
   };
 
   ns.update_price_source = function(item_id, source, descr, price_str, price_editable) {
 
     $.post("controller.pl", data, kivi.eval_json_result);
   };
 
   ns.update_price_source = function(item_id, source, descr, price_str, price_editable) {

-    var row = $('#item_' + item_id).parents("tbody").first();
+    var row        = $('#item_' + item_id).parents("tbody").first();

     var source_elt = $(row).find('[name="order.orderitems[].active_price_source"]');
     var button_elt = $(row).find('[name="price_chooser_button"]');
 
     button_elt.val(button_elt.val().replace(/.*\|/, descr + " |"));
     source_elt.val(source);
 
     var source_elt = $(row).find('[name="order.orderitems[].active_price_source"]');
     var button_elt = $(row).find('[name="price_chooser_button"]');
 
     button_elt.val(button_elt.val().replace(/.*\|/, descr + " |"));
     source_elt.val(source);
 

-    var editable_div_elt = $(row).find('[name="editable_price"]');
+    var editable_div_elt     = $(row).find('[name="editable_price"]');

     var not_editable_div_elt = $(row).find('[name="not_editable_price"]');
     if (price_editable == 1 && source === '') {
       // editable
     var not_editable_div_elt = $(row).find('[name="not_editable_price"]');
     if (price_editable == 1 && source === '') {
       // editable


@@ -496,14 +592,14 @@ namespace('kivi.Order', function(ns) {
   };
 
   ns.update_discount_source = function(item_id, source, descr, discount_str, price_editable) {
   };
 
   ns.update_discount_source = function(item_id, source, descr, discount_str, price_editable) {

-    var row = $('#item_' + item_id).parents("tbody").first();
+    var row        = $('#item_' + item_id).parents("tbody").first();

     var source_elt = $(row).find('[name="order.orderitems[].active_discount_source"]');
     var button_elt = $(row).find('[name="price_chooser_button"]');
 
     button_elt.val(button_elt.val().replace(/\|.*/, "| " + descr));
     source_elt.val(source);
 
     var source_elt = $(row).find('[name="order.orderitems[].active_discount_source"]');
     var button_elt = $(row).find('[name="price_chooser_button"]');
 
     button_elt.val(button_elt.val().replace(/\|.*/, "| " + descr));
     source_elt.val(source);
 

-    var editable_div_elt = $(row).find('[name="editable_discount"]');
+    var editable_div_elt     = $(row).find('[name="editable_discount"]');

     var not_editable_div_elt = $(row).find('[name="not_editable_discount"]');
     if (price_editable == 1 && source === '') {
       // editable
     var not_editable_div_elt = $(row).find('[name="not_editable_discount"]');
     if (price_editable == 1 && source === '') {
       // editable


@@ -534,18 +630,18 @@ namespace('kivi.Order', function(ns) {
     if ($('#type').val() !== 'sales_order') return;
 
     kivi.popup_dialog({
     if ($('#type').val() !== 'sales_order') return;
 
     kivi.popup_dialog({

-      url: 'controller.pl?action=Order/show_periodic_invoices_config_dialog',
-      data: { type       : $('#type').val(),
-              id         : $('#id').val(),
-              config     : $('#order_periodic_invoices_config').val(),
-              customer_id: $('#order_customer_id').val(),
-              transdate  : $('#order_transdate').val(),
-              language_id: $('#language_id').val()
-            },
-      id: 'jq_periodic_invoices_config_dialog',
-      load: kivi.reinit_widgets,
+      url:    'controller.pl?action=Order/show_periodic_invoices_config_dialog',
+      data:   { type:              $('#type').val(),
+                id:                $('#id').val(),
+                config:            $('#order_periodic_invoices_config').val(),
+                customer_id:       $('#order_customer_id').val(),
+                transdate_as_date: $('#order_transdate_as_date').val(),
+                language_id:       $('#language_id').val()
+              },
+      id:     'jq_periodic_invoices_config_dialog',
+      load:   kivi.reinit_widgets,

       dialog: {
       dialog: {

-        title: kivi.t8('Edit the configuration for periodic invoices'),
+        title:  kivi.t8('Edit the configuration for periodic invoices'),

         width:  800,
         height: 650
       }
         width:  800,
         height: 650
       }


@@ -559,8 +655,8 @@ namespace('kivi.Order', function(ns) {
 
   ns.assign_periodic_invoices_config = function() {
     var data = $('[name="Form"]').serializeArray();
 
   ns.assign_periodic_invoices_config = function() {
     var data = $('[name="Form"]').serializeArray();

-    data.push({ name: 'type',   value: $('#type').val() });
-    data.push({ name: 'action', value: 'Order/assign_periodic_invoices_config' });
+    data.push({ name: 'type',   value: $('#type').val() },
+              { name: 'action', value: 'Order/assign_periodic_invoices_config' });

     $.post("controller.pl", data, kivi.eval_json_result);
   };
 
     $.post("controller.pl", data, kivi.eval_json_result);
   };
 


@@ -570,16 +666,16 @@ namespace('kivi.Order', function(ns) {
 
     var active = false;
     $.ajax({
 
     var active = false;
     $.ajax({

-      url: 'controller.pl',
-      data: { action: 'Order/get_has_active_periodic_invoices',
-              type  : type,
-              id    : $('#id').val(),
-              config: $('#order_periodic_invoices_config').val(),
-      },
-      method: "GET",
-      async: false,
+      url:      'controller.pl',
+      data:     { action: 'Order/get_has_active_periodic_invoices',
+                  type  : type,
+                  id    : $('#id').val(),
+                  config: $('#order_periodic_invoices_config').val(),
+                },
+      method:   "GET",
+      async:    false,

       dataType: 'text',
       dataType: 'text',

-      success: function(val){
+      success:  function(val) {

         active = val;
       }
     });
         active = val;
       }
     });


@@ -607,15 +703,15 @@ namespace('kivi.Order', function(ns) {
     }
 
     kivi.popup_dialog({
     }
 
     kivi.popup_dialog({

-      url: 'controller.pl',
-      data: { action: 'Order/show_customer_vendor_details_dialog',
-              type  : $('#type').val(),
-              vc    : vc,
-              vc_id : vc_id
-            },
-      id: 'jq_customer_vendor_details_dialog',
+      url:    'controller.pl',
+      data:   { action: 'Order/show_customer_vendor_details_dialog',
+                type  : $('#type').val(),
+                vc    : vc,
+                vc_id : vc_id
+              },
+      id:     'jq_customer_vendor_details_dialog',

       dialog: {
       dialog: {

-        title: title,
+        title:  title,

         width:  800,
         height: 650
       }
         width:  800,
         height: 650
       }


@@ -624,17 +720,17 @@ namespace('kivi.Order', function(ns) {
   };
 
   ns.show_calculate_qty_dialog = function(clicked) {
   };
 
   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 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');

 
 

-    calculate_qty_selection_window("", input_id, "", formula_id);
+    calculate_qty_selection_dialog("", input_id, "", formula_id);

     return true;
     return true;

-  }
+  };

 
 });
 
 
 });
 

-$(function(){
+$(function() {

   if ($('#type').val() == 'sales_order' || $('#type').val() == 'sales_quotation' ) {
     $('#order_customer_id').change(kivi.Order.reload_cv_dependant_selections);
   } else {
   if ($('#type').val() == 'sales_order' || $('#type').val() == 'sales_quotation' ) {
     $('#order_customer_id').change(kivi.Order.reload_cv_dependant_selections);
   } else {


@@ -650,7 +746,7 @@ $(function(){
   $('#add_item_parts_id').on('set_item:PartPicker', function(e,o) { $('#add_item_unit').val(o.unit) });
 
   $('.add_item_input').keydown(function(event) {
   $('#add_item_parts_id').on('set_item:PartPicker', function(e,o) { $('#add_item_unit').val(o.unit) });
 
   $('.add_item_input').keydown(function(event) {

-    if(event.keyCode == 13) {
+    if (event.keyCode == 13) {

       event.preventDefault();
       kivi.Order.add_item();
       return false;
       event.preventDefault();
       kivi.Order.add_item();
       return false;