Lagerbewegungen/-bestände auch mit Mindesthaltbarkeitsdatum importieren können.

[mfinanz.git] / js / autocomplete_part.js

diff --git a/js/autocomplete_part.js b/js/autocomplete_part.js
index de8f6e535681b0ca2a65e1c20a946e8c9f0b853e..8c304bba3e6719476c70b0a95ea00e43301582d0 100644 (file)
--- a/js/autocomplete_part.js
+++ b/js/autocomplete_part.js
@@ -32,7 +32,6 @@ namespace('kivi', function(k){
     var $type   = $('#' + real_id + '_type');
     var $unit   = $('#' + real_id + '_unit');
     var $convertible_unit = $('#' + real_id + '_convertible_unit');
     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 last_dummy = $dummy.val();
     var state   = STATES.PICKED;
     var last_real = $real.val();
     var last_dummy = $dummy.val();


@@ -61,7 +60,6 @@ namespace('kivi', function(k){
         'filter.obsolete': 0,
         'filter.unit_obj.convertible_to': $convertible_unit && $convertible_unit.val() ? $convertible_unit.val() : '',
         no_paginate:  $('#no_paginate').prop('checked') ? 1 : 0,
         'filter.obsolete': 0,
         'filter.unit_obj.convertible_to': $convertible_unit && $convertible_unit.val() ? $convertible_unit.val() : '',
         no_paginate:  $('#no_paginate').prop('checked') ? 1 : 0,

-        column:   $column && $column.val() ? $column.val() : '',

         current:  $real.val(),
       };
 
         current:  $real.val(),
       };
 


@@ -77,8 +75,8 @@ namespace('kivi', function(k){
     function set_item (item) {
       if (item.id) {
         $real.val(item.id);
     function set_item (item) {
       if (item.id) {
         $real.val(item.id);

-        // autocomplete ui has name, ajax items have description
-        $dummy.val(item.name ? item.name : item.description);
+        // autocomplete ui has name, use the value for ajax items, which contains displayable_name
+        $dummy.val(item.name ? item.name : item.value);

       } else {
         $real.val('');
         $dummy.val('');
       } else {
         $real.val('');
         $dummy.val('');


@@ -225,7 +223,7 @@ namespace('kivi', function(k){
     var picker = $('<div>');
     $dummy.after(pcont);
     pcont.append(picker);
     var picker = $('<div>');
     $dummy.after(pcont);
     pcont.append(picker);

-    picker.addClass('icon16 crm--search').click(open_dialog);
+    picker.addClass('icon16 search').click(open_dialog);

 
     var pp = {
       real:           function() { return $real },
 
     var pp = {
       real:           function() { return $real },


@@ -233,7 +231,6 @@ namespace('kivi', function(k){
       type:           function() { return $type },
       unit:           function() { return $unit },
       convertible_unit: function() { return $convertible_unit },
       type:           function() { return $type },
       unit:           function() { return $unit },
       convertible_unit: function() { return $convertible_unit },

-      column:         function() { return $column },

       update_results: update_results,
       result_timer:   result_timer,
       set_item:       set_item,
       update_results: update_results,
       result_timer:   result_timer,
       set_item:       set_item,