From: Jan Büren <jan@kivitendo.de>
Date: Fri, 16 Nov 2018 09:18:35 +0000 (+0100)
Subject: Artikelsuche: Lieferant und Lieferantenartikelnummer wieder als Berichts-Option anbieten
X-Git-Tag: release-3.5.4~218
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=89407ec80726ec63590428c4190c181b922a0e87;p=kivitendo-erp.git

Artikelsuche: Lieferant und Lieferantenartikelnummer wieder als Berichts-Option anbieten

Ist mit der Umstellung auf den Part-Controller verloren gegangen.
---

diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index dd183b264..9e3da5125 100644
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -203,6 +203,8 @@ sub generate_report {
     'projectdescription' => { 'text' => $locale->text('Project Description'), },
     'warehouse'          => { 'text' => $locale->text('Default Warehouse'), },
     'bin'                => { 'text' => $locale->text('Default Bin'), },
+    'make'               => { 'text' => $locale->text('Make'), },
+    'model'              => { 'text' => $locale->text('Model'), },
   );
 
   $revers     = $form->{revers};
@@ -381,7 +383,7 @@ sub generate_report {
 
   my @columns = qw(
     partnumber type_and_classific description notes partsgroup warehouse bin
-    onhand rop soldtotal unit listprice
+    make model onhand rop soldtotal unit listprice
     linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost
     priceupdate weight image drawing microfiche invnumber ordnumber quonumber
     transdate name serialnumber deliverydate ean projectnumber projectdescription
diff --git a/templates/webpages/ic/search.html b/templates/webpages/ic/search.html
index 5847eb949..3e68dc0cf 100644
--- a/templates/webpages/ic/search.html
+++ b/templates/webpages/ic/search.html
@@ -228,6 +228,8 @@
          <tr>
           <td>[%- L.checkbox_tag('l_warehouse', label=LxERP.t8('Default Warehouse'), value='Y') %]</td>
           <td>[%- L.checkbox_tag('l_bin', label=LxERP.t8('Default Bin'), value='Y') %]</td>
+          <td>[%- L.checkbox_tag('l_make', label=LxERP.t8('Make'), value='Y') %]</td>
+          <td>[%- L.checkbox_tag('l_model', label=LxERP.t8('Model'), value='Y') %]</td>
          </tr>
 
          [% CUSTOM_VARIABLES_INCLUSION_CODE %]