projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Partpicker: Filtermöglichkeit nach konvertierbaren Einheiten ('convertible_unit')
[kivitendo-erp.git]
/
js
/
autocomplete_part.js
diff --git
a/js/autocomplete_part.js
b/js/autocomplete_part.js
index
5c6b65a
..
b9ef3e9
100644
(file)
--- 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 $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();
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,
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(),
};
current: $real.val(),
};
@@
-154,6
+156,7
@@
namespace('kivi', function(k){
dummy: function() { return $dummy },
type: function() { return $type },
unit: function() { return $unit },
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,
column: function() { return $column },
update_results: update_results,
set_item: set_item,