X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fkivi.Part.js;h=4f813bbf4713183b1267db65283b22970576eee7;hb=ed0754c2f82cab2e24100107b534692d5455b02d;hp=0b0185bf3327ea70ef6b55ebf3151fc1c8789c1a;hpb=2de6b9633d8b9d2cec532920ecd7dfb3a2d76df7;p=kivitendo-erp.git diff --git a/js/kivi.Part.js b/js/kivi.Part.js index 0b0185bf3..4f813bbf4 100644 --- a/js/kivi.Part.js +++ b/js/kivi.Part.js @@ -334,7 +334,6 @@ namespace('kivi.Part', function(ns) { }, ajax_data: function(term) { var data = { - 'filter.all:substr:multi::ilike': term, current: this.$real.val(), }; @@ -356,6 +355,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) { @@ -687,6 +695,11 @@ namespace('kivi.Part', function(ns) { var self = this; var data = $('#multi_items_form').serializeArray(); data.push({ name: 'type', value: self.pp.type }); + 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,