From: Bernd Bleßmann <bernd@kivitendo-premium.de>
Date: Fri, 19 Jul 2019 13:48:09 +0000 (+0200)
Subject: Auftrags-Controller: PartPicker filtert nach Kunden- und Lieferanten-Art.-Nr., …
X-Git-Tag: release-3.5.6.1~547
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=4db13ebb44454523e8fab2d1cfa034e28a059ec0;p=kivitendo-erp.git

Auftrags-Controller: PartPicker filtert nach Kunden- und Lieferanten-Art.-Nr., …

… sofern das in den Benutzereinstellungen ausgewählt ist.
---

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index f6f6986a1..e27c10eea 100644
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -1564,6 +1564,10 @@ sub pre_render {
   $self->{order_probabilities}        = [ map { { title => ($_ * 10) . '%', id => $_ * 10 } } (0..10) ];
   $self->{positions_scrollbar_height} = SL::Helper::UserPreferences::PositionsScrollbar->new()->get_height();
 
+  my $user_prefs = SL::Helper::UserPreferences::PartPickerSearch->new();
+  $self->{search_cvpartnumber} = !!$user_prefs->get_sales_search_customer_partnumber() if $self->cv eq 'customer';
+  $self->{search_cvpartnumber} = !!$user_prefs->get_purchase_search_makemodel()        if $self->cv eq 'vendor';
+
   my $print_form = Form->new('');
   $print_form->{type}      = $self->type;
   $print_form->{printers}  = SL::DB::Manager::Printer->get_all_sorted;
diff --git a/templates/webpages/order/tabs/_item_input.html b/templates/webpages/order/tabs/_item_input.html
index 9c6b5725f..80ba16393 100644
--- a/templates/webpages/order/tabs/_item_input.html
+++ b/templates/webpages/order/tabs/_item_input.html
@@ -14,7 +14,10 @@
     </thead>
     <tbody>
       <tr valign="top" class="listrow">
-        <td>[% P.part.picker('add_item.parts_id', '', fat_set_item=1, style='width: 300px', class="add_item_input") %]</td>
+        <td>
+          [%- SET PARAM_KEY = SELF.cv == "customer" ? 'with_customer_partnumber' : 'with_makemodel' -%]
+          [%- SET PARAM_VAL = SELF.search_cvpartnumber -%]
+          [% P.part.picker('add_item.parts_id', '', fat_set_item=1, style='width: 300px', class="add_item_input", $PARAM_KEY=PARAM_VAL) %]</td>
         <td>[% L.input_tag('add_item.description', '', class="add_item_input") %]</td>
         <td>
           [% L.input_tag('add_item.qty_as_number', '', size = 5, class="add_item_input numeric") %]
diff --git a/templates/webpages/order/tabs/basic_data.html b/templates/webpages/order/tabs/basic_data.html
index 7966271a4..cad409f97 100644
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/order/tabs/basic_data.html
@@ -187,7 +187,7 @@
     </tr>
   </table>
 
-  [%- PROCESS order/tabs/_item_input.html %]
+  [%- PROCESS order/tabs/_item_input.html SELF=SELF %]
 
   [% L.button_tag('kivi.Order.show_multi_items_dialog()', LxERP.t8('Add multiple items')) %]