From 3a13039a9d18b1a07cccbf6c4628671c38816150 Mon Sep 17 00:00:00 2001
From: "G. Richardson" <information@kivitendo-premium.de>
Date: Thu, 24 Nov 2016 11:23:12 +0100
Subject: [PATCH] Berichte->Artikel kann Sortimente und
 Sortimentklassifizierung
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

die Abkürzung für das Sortiment ist 'S'
---
 SL/IC.pm                          | 9 +++++----
 locale/de/all                     | 1 +
 locale/en/all                     | 4 ++++
 templates/webpages/ic/search.html | 4 ++++
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/SL/IC.pm b/SL/IC.pm
index ce5e31e09..e455d38e1 100644
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -897,11 +897,12 @@ sub all_parts {
   }
 
   # Oder Bedingungen fuer Ware Dienstleistung Erzeugnis:
-  if ($form->{l_part} || $form->{l_assembly} || $form->{l_service}) {
+  if ($form->{l_part} || $form->{l_assembly} || $form->{l_service} || $form->{l_assortment}) {
       my @or_tokens = ();
-      push @or_tokens, "p.part_type = 'service'"  if $form->{l_service};
-      push @or_tokens, "p.part_type = 'assembly'" if $form->{l_assembly};
-      push @or_tokens, "p.part_type = 'part'"     if $form->{l_part};
+      push @or_tokens, "p.part_type = 'service'"    if $form->{l_service};
+      push @or_tokens, "p.part_type = 'assembly'"   if $form->{l_assembly};
+      push @or_tokens, "p.part_type = 'part'"       if $form->{l_part};
+      push @or_tokens, "p.part_type = 'assortment'" if $form->{l_assortment};
       push @where_tokens, join ' OR ', map { "($_)" } @or_tokens;
   }
   else {
diff --git a/locale/de/all b/locale/de/all
index cd143fd3e..619b801af 100755
--- a/locale/de/all
+++ b/locale/de/all
@@ -318,6 +318,7 @@ $self->{texts} = {
   'Assignment of articles to sections' => 'Zuweisung von Artikeln zu Abschnitten',
   'Assistant for general ledger corrections' => 'Assistent für die Korrektur von Hauptbucheinträgen',
   'Assortment'                  => 'Sortiment',
+  'Assortment (typeabbreviation)' => 'S',
   'Assortment items'            => 'Sortimentsartikel',
   'Assortments'                 => 'Sortimente',
   'Assume Tax Consultant Data in Tax Computation?' => 'Beraterdaten in UStVA übernehmen?',
diff --git a/locale/en/all b/locale/en/all
index 121ad42e7..c0b120af6 100644
--- a/locale/en/all
+++ b/locale/en/all
@@ -313,6 +313,10 @@ $self->{texts} = {
   'Assigned invoices'           => '',
   'Assignment of articles to sections' => '',
   'Assistant for general ledger corrections' => '',
+  'Assortment'                  => '',
+  'Assortment (typeabbreviation)' => 'S',
+  'Assortment items'            => '',
+  'Assortments'                 => '',
   'Assume Tax Consultant Data in Tax Computation?' => '',
   'At least'                    => '',
   'At least one Perl module that kivitendo ERP requires for running is not installed on your system.' => '',
diff --git a/templates/webpages/ic/search.html b/templates/webpages/ic/search.html
index aeb7eafac..17bfb0110 100644
--- a/templates/webpages/ic/search.html
+++ b/templates/webpages/ic/search.html
@@ -37,6 +37,10 @@
           <input name="l_assembly" id="l_assembly" class="checkbox" type="checkbox" value="Y" checked>
           <label for="l_assembly">[% 'Assembly' | $T8 %]</label>
         </td>
+        <td>
+          <input name="l_assortment" id="l_assortment" class="checkbox" type="checkbox" value="Y" checked>
+          <label for="l_assortment">[% 'Assortment' | $T8 %]</label>
+        </td>
        </tr></table></td>
       </tr>
       <tr>
-- 
2.20.1