X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fautocomplete_part.js;h=b9ef3e92476cd7f0cb60d1db8ebb62f6eb90bcba;hb=df33875fc30c508b60af9421d0061e66cdc0d55a;hp=5c6b65a8a40507fde9647538d1857a4babc3078f;hpb=880a2e9f233d585d9e1a3d8dc17b2795b8513fcf;p=kivitendo-erp.git diff --git a/js/autocomplete_part.js b/js/autocomplete_part.js index 5c6b65a8a..b9ef3e924 100644 --- a/js/autocomplete_part.js +++ b/js/autocomplete_part.js @@ -13,6 +13,7 @@ namespace('kivi', function(k){ var $dummy = $('#' + real_id + '_name'); var $type = $('#' + real_id + '_type'); var $unit = $('#' + real_id + '_unit'); + var $convertible_unit = $('#' + real_id + '_convertible_unit'); var $column = $('#' + real_id + '_column'); var state = STATES.PICKED; var last_real = $real.val(); @@ -32,7 +33,8 @@ namespace('kivi', function(k){ var data = { 'filter.all:substr::ilike': term, 'filter.obsolete': 0, - column: $column.val()===undefined ? '' : $column.val(), + 'filter.unit_obj.convertible_to': $convertible_unit && $convertible_unit.val() ? $convertible_unit.val() : '', + column: $column && $column.val() ? $column.val() : '', current: $real.val(), }; @@ -154,6 +156,7 @@ namespace('kivi', function(k){ dummy: function() { return $dummy }, type: function() { return $type }, unit: function() { return $unit }, + convertible_unit: function() { return $convertible_unit }, column: function() { return $column }, update_results: update_results, set_item: set_item,