X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fkivi.Part.js;h=8daaf8c33dd9131e9e62f2b1a72d03a30139e19d;hb=92f6fae1e8c4861460ae364ac7dc243b429a9cb6;hp=9fa07183997e0f76259aaa5b537ec42fb401288c;hpb=8fdb9983021ac73551052681d3a9d69514447a58;p=kivitendo-erp.git

diff --git a/js/kivi.Part.js b/js/kivi.Part.js
index 9fa071839..8daaf8c33 100644
--- a/js/kivi.Part.js
+++ b/js/kivi.Part.js
@@ -312,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');
@@ -323,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();
   };
@@ -334,14 +336,18 @@ 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(',');
 
@@ -351,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) {
@@ -474,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);
@@ -552,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'),
@@ -650,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: {
@@ -681,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,
@@ -712,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();