From: Sven Schöling <s.schoeling@linet-services.de>
Date: Thu, 7 Aug 2014 10:11:34 +0000 (+0200)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.2.0beta~358
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/75855995cd0b3213b764b2b54fe1d2c18d4b7fde?hp=0cb6e3af8457c1b10c356a1749269b16c5cd3328

Merge branch 'master' of github.com:kivitendo/kivitendo-erp
---

diff --git a/js/autocomplete_part.js b/js/autocomplete_part.js
index d9bf8dbbb..fd1bda87c 100644
--- a/js/autocomplete_part.js
+++ b/js/autocomplete_part.js
@@ -31,6 +31,7 @@ namespace('kivi', function(k){
     var state   = STATES.PICKED;
     var last_real = $real.val();
     var last_dummy = $dummy.val();
+    var last_unverified_dummy = $dummy.val();
     var timer;
 
     function open_dialog () {
@@ -38,7 +39,7 @@ namespace('kivi', function(k){
         url: 'controller.pl?action=Part/part_picker_search',
         data: $.extend({
           real_id: real_id,
-        }, ajax_data($dummy.val())),
+        }, ajax_data(last_unverified_dummy)),
         id: 'part_selection',
         dialog: {
           title: k.t8('Part picker'),
@@ -102,6 +103,7 @@ namespace('kivi', function(k){
       else if (state == STATES.UNDEFINED && $dummy.val() == '')
         set_item({})
       else
+        last_unverified_dummy = $dummy.val();
         set_item({ id: last_real, name: last_dummy })
     }
 
diff --git a/templates/webpages/part/part_picker_search.html b/templates/webpages/part/part_picker_search.html
index 96ddeb26f..4d625c7ae 100644
--- a/templates/webpages/part/part_picker_search.html
+++ b/templates/webpages/part/part_picker_search.html
@@ -5,7 +5,7 @@
 
 <div style='overflow:hidden'>
 
-[% LxERP.t8("Filter") %]: [% L.input_tag('part_picker_filter', SELF.filter.all_substr__ilike, class='part_picker_filter') %]
+[% LxERP.t8("Filter") %]: [% L.input_tag('part_picker_filter', SELF.filter.all_substr_multi__ilike, class='part_picker_filter') %]
 [% L.hidden_tag('part_picker_real_id', FORM.real_id) %]
 
 <div class='float-right'>