X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fkivi.Part.js;h=b83fb044d711870d75a10615fa4680d6536c19f2;hb=14fd87107e86d96894c3f731245172ec04554dd1;hp=dd6010b2cdf5f4d413e64688ef099ebe322d8930;hpb=bff364a0741fe8f0198d3fd5ac6f00b1cdf0e62d;p=kivitendo-erp.git

diff --git a/js/kivi.Part.js b/js/kivi.Part.js
index dd6010b2c..b83fb044d 100644
--- a/js/kivi.Part.js
+++ b/js/kivi.Part.js
@@ -173,7 +173,7 @@ namespace('kivi.Part', function(ns) {
     var data = $('#assembly :input').serializeArray();
     data.push({ name: 'action', value: 'Part/add_assembly_item' },
               { name: 'part.id', value: $("#part_id").val()     },
-              { name: 'part.part_type', value: 'assortment'     });
+              { name: 'part.part_type', value: 'assembly'       });
     $('#assembly_picker').data('part_picker').clear();
 
     $.post("controller.pl", data, kivi.eval_json_result);
@@ -194,7 +194,7 @@ namespace('kivi.Part', function(ns) {
   ns.close_picker_dialogs = function() {
     $('.part_autocomplete').each(function(_, e) {
       var picker = $(e).data('part_picker');
-      if (picker) picker.close_dialog();
+      if (picker && picker.dialog) picker.close_dialog();
     });
   }
 
@@ -245,6 +245,7 @@ namespace('kivi.Part', function(ns) {
 
     var data = $('#makemodel_table :input').serializeArray();
     data.push({ name: 'action', value: 'Part/add_makemodel_row' });
+    $('#add_makemodel').data('customer_vendor_picker').clear();
 
     $.post("controller.pl", data, kivi.eval_json_result);
   };
@@ -253,6 +254,36 @@ namespace('kivi.Part', function(ns) {
     $("#makemodel_rows tr:last").find('input[type=text]').filter(':visible:first').focus();
   };
 
+
+  // customerprice
+  ns.customerprice_renumber_positions = function() {
+    $('.customerprice_row [name="position"]').each(function(idx, elt) {
+      $(elt).html(idx+1);
+    });
+  };
+
+  ns.delete_customerprice_row = function(clicked) {
+    var row = $(clicked).closest('tr');
+    $(row).remove();
+
+    ns.customerprice_renumber_positions();
+  };
+
+  ns.add_customerprice_row = function() {
+    if ($('#add_customerprice').val() === '') return;
+
+    var data = $('#customerprice_table :input').serializeArray();
+    data.push({ name: 'action', value: 'Part/add_customerprice_row' });
+    $('#add_customerprice').data('customer_vendor_picker').clear();
+
+    $.post("controller.pl", data, kivi.eval_json_result);
+  };
+
+  ns.focus_last_customerprice_input = function () {
+    $("#customerprice_rows tr:last").find('input[type=text]').filter(':visible:first').focus();
+  };
+
+
   ns.reload_bin_selection = function() {
     $.post("controller.pl", { action: 'Part/warehouse_changed', warehouse_id: function(){ return $('#part_warehouse_id').val() } },   kivi.eval_json_result);
   }
@@ -281,7 +312,8 @@ namespace('kivi.Part', function(ns) {
         commit_none: function(){ },
         commit_one:  function(){ $('#update_button').click(); },
         commit_many: function(){ self.open_dialog(); }
-      }
+      },
+      multiple_limit: 100
     }, $real.data('part-picker-data'), options);
     this.$real              = $real;
     this.real_id            = $real.attr('id');
@@ -292,6 +324,7 @@ namespace('kivi.Part', function(ns) {
     this.last_dummy         = this.$dummy.val();
     this.timer              = undefined;
     this.dialog             = undefined;
+    this.multiple_default   = this.o.multiple;
 
     this.init();
   };
@@ -303,16 +336,20 @@ namespace('kivi.Part', function(ns) {
     },
     ajax_data: function(term) {
       var data = {
-        'filter.all:substr:multi::ilike': term,
-        'filter.obsolete': 0,
         current:  this.$real.val(),
       };
 
       if (this.o.part_type)
         data['filter.part_type'] = this.o.part_type.split(',');
 
+      if (this.o.status) {
+        if (this.o.status == 'active')   data['filter.obsolete'] = 0;
+        if (this.o.status == 'obsolete') data['filter.obsolete'] = 1;
+      } else
+        data['filter.obsolete'] = 0;
+
       if (this.o.classification_id)
-        data['filter.classification_id'] = this.o.classification_id.split(',');
+        data['filter.classification_id:any'] = this.o.classification_id.replaceAll(',', ' ');
 
       if (this.o.unit)
         data['filter.unit'] = this.o.unit.split(',');
@@ -320,6 +357,15 @@ namespace('kivi.Part', function(ns) {
       if (this.o.convertible_unit)
         data['filter.unit_obj.convertible_to'] = this.o.convertible_unit;
 
+      var filter_name = 'all';
+      if (this.o.with_makemodel) {
+        filter_name = 'all_with_makemodel';
+      }
+      if (this.o.with_customer_partnumber) {
+        filter_name = 'all_with_customer_partnumber';
+      }
+      data['filter.' + filter_name + ':substr:multi::ilike'] = term;
+
       return data;
     },
     set_item: function(item) {
@@ -443,6 +489,7 @@ namespace('kivi.Part', function(ns) {
     },
     open_dialog: function() {
       if (this.o.multiple) {
+        this.o.multiple = this.multiple_default;
         this.dialog = new ns.PickerMultiPopup(this);
       } else {
         this.dialog = new ns.PickerPopup(this);
@@ -465,6 +512,9 @@ namespace('kivi.Part', function(ns) {
         },
         select: function(event, ui) {
           self.set_item(ui.item);
+          if (self.o.action.commit_one) {
+            self.run_action(self.o.action.commit_one);
+          }
         },
         search: function(event, ui) {
           if ((event.which == KEY.SHIFT) || (event.which == KEY.CTRL) || (event.which == KEY.ALT))
@@ -518,7 +568,9 @@ namespace('kivi.Part', function(ns) {
       var self = this;
       kivi.popup_dialog({
         url: 'controller.pl?action=Part/part_picker_search',
-        data: self.pp.ajax_data(this.pp.$dummy.val()),
+        data: $.extend({
+          real_id: self.pp.real_id,
+        }, self.pp.ajax_data(this.pp.$dummy.val())),
         id: 'part_selection',
         dialog: {
           title: kivi.t8('Part picker'),
@@ -560,6 +612,7 @@ namespace('kivi.Part', function(ns) {
             id:   $(this).children('input.part_picker_id').val(),
             name: $(this).children('input.part_picker_description').val(),
             classification_id: $(this).children('input.part_picker_classification_id').val(),
+            ean:  $(this).children('input.part_picker_ean').val(),
             unit: $(this).children('input.part_picker_unit').val(),
             partnumber:  $(this).children('input.part_picker_partnumber').val(),
             description: $(this).children('input.part_picker_description').val(),
@@ -615,6 +668,7 @@ namespace('kivi.Part', function(ns) {
         url: 'controller.pl?action=Part/show_multi_items_dialog',
         data: $.extend({
           real_id: self.pp.real_id,
+          show_pos_input: self.pp.o.multiple_pos_input,
         }, self.pp.ajax_data(this.pp.$dummy.val())),
         id: 'jq_multi_items_dialog',
         dialog: {
@@ -646,7 +700,13 @@ namespace('kivi.Part', function(ns) {
     update_results: function() {
       var self = this;
       var data = $('#multi_items_form').serializeArray();
-      data.push({ name: 'type', value: self.pp.type });
+      data.push({ name: 'type',  value: self.pp.type });
+      data.push({ name: 'limit', value: self.pp.o.multiple_limit });
+      var ppdata = self.pp.ajax_data(function(){
+        var val = $('#multi_items_filter').val();
+        return val === undefined ? '' : val
+      });
+      $.each(Object.keys(ppdata), function() {data.push({ name: 'multi_items.' + this, value: ppdata[this]});});
       $.ajax({
         url: 'controller.pl?action=Part/multi_items_update_result',
         data: data,
@@ -677,12 +737,12 @@ namespace('kivi.Part', function(ns) {
       $('#jq_multi_items_dialog').dialog('close');
     },
     disable_continue: function() {
-      $('#multi_items_result input').off("keydown");
+      $('#multi_items_result input, #multi_items_position').off("keydown");
       $('#continue_button').prop('disabled', true);
     },
     enable_continue: function() {
       var self = this;
-      $('#multi_items_result input').keydown(function(event) {
+      $('#multi_items_result input, #multi_items_position').keydown(function(event) {
         if(event.keyCode == KEY.ENTER) {
           event.preventDefault();
           self.add_multi_items();
@@ -714,6 +774,14 @@ namespace('kivi.Part', function(ns) {
       if (!$(elt).data('part_picker'))
         $(elt).data('part_picker', new kivi.Part.Picker($(elt)));
     });
+
+    kivi.run_once_for('#customerprice_rows', 'customerprice_row_sort_renumber', function(elt) {
+      $(elt).on('sortstop', kivi.Part.customerprice_renumber_positions);
+    });
+
+    kivi.run_once_for('#makemodel_rows', 'makemodel_row_sort_renumber', function(elt) {
+      $(elt).on('sortstop', kivi.Part.makemodel_renumber_positions);
+    });
   }
 
   ns.init = function() {
@@ -725,14 +793,6 @@ namespace('kivi.Part', function(ns) {
        ns.reformat_number(event);
     });
 
-    $('.add_makemodel_input').keydown(function(event) {
-      if(event.keyCode == 13) {
-        event.preventDefault();
-        ns.add_makemodel_row();
-        return false;
-      }
-    });
-
     $('#part_warehouse_id').change(kivi.Part.reload_bin_selection);
 
     ns.init();