From: G. Richardson <information@kivitendo-premium.de>
Date: Wed, 19 Apr 2017 13:25:01 +0000 (+0200)
Subject: Feature Sortiment als experimentell markiert
X-Git-Tag: release-3.5.4~1111
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=c182857ee4e8e32ccebaf1f5cb45d58b9006e699;p=kivitendo-erp.git

Feature Sortiment als experimentell markiert
---

diff --git a/doc/changelog b/doc/changelog
index f4bad16fa..fafae9239 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -153,7 +153,7 @@ kleinere neue Features und Detailverbesserungen:
     Verkaufsaufträgen finden zu können:
     Verkauf -> Berichte -> Auftragsartikelsuche
 
-  - Neuer Artikeltyp "Sortiment"
+  - Neuer Artikeltyp "Sortiment" (experimentell)
     Einem Sortiment können wie einem Erzeugnis mehrere Artikel zugeordnet
     werden. Beim Hinzufügen eines Sortiments zu einem Beleg werden alle
     Bestandteile des Sortiments als Einzelteile zum Beleg hinzugefügt, so als
@@ -171,6 +171,7 @@ kleinere neue Features und Detailverbesserungen:
 
     Einschränkungen: das "Auspacken" eines Sortiments beim Hinzufügen in einem
     Beleg funktioniert derzeit nur beim neuen Auftragscontroller.
+    Auftragscontroller und Sortiment haben beide noch den Status experimentell.
 
   - Detailverbesserung Druckvorlage RB
     Adressfeld um Absender ergänzt. Firmenname nicht mehr aus Titlebar, sondern
diff --git a/menus/user/00-erp.yaml b/menus/user/00-erp.yaml
index 53899b657..c520c4b68 100644
--- a/menus/user/00-erp.yaml
+++ b/menus/user/00-erp.yaml
@@ -74,7 +74,7 @@
   name: Add Assortment
   icon: assortment_add
   order: 550
-  access: part_service_assembly_edit
+  access: part_service_assembly_edit & client/feature_experimental
   params:
     action: Part/add_assortment
 - parent: master_data
diff --git a/templates/webpages/client_config/_features.html b/templates/webpages/client_config/_features.html
index 31885b848..b3c2c4f27 100644
--- a/templates/webpages/client_config/_features.html
+++ b/templates/webpages/client_config/_features.html
@@ -304,7 +304,7 @@
   <tr>
    <td align="right">[% LxERP.t8('Enable experimental features') %]</td>
    <td>[% L.yes_no_tag('defaults.feature_experimental', SELF.defaults.feature_experimental) %]</td>
-   <td>[% LxERP.t8('Experimental features are:') %] [% LxERP.t8('new order controller') %]</td>
+   <td>[% LxERP.t8('Experimental features are:') %] [% LxERP.t8('new order controller') %], [% LxERP.t8('Assortment') %]</td>
   </tr>
 
  </table>
diff --git a/templates/webpages/client_config/_ranges_of_numbers.html b/templates/webpages/client_config/_ranges_of_numbers.html
index a7cc99343..758c7d970 100644
--- a/templates/webpages/client_config/_ranges_of_numbers.html
+++ b/templates/webpages/client_config/_ranges_of_numbers.html
@@ -44,8 +44,10 @@
   <tr>
    <td align="right" nowrap>[% LxERP.t8('Last Sales Delivery Order Number') %]</td>
    <td>[% L.input_tag("defaults.sdonumber", SELF.defaults.sdonumber, size="15") %]</td>
+   [%- IF INSTANCE_CONF.get_feature_experimental %]
    <td align="right" nowrap>[% LxERP.t8('Last Assortment Number') %]</td>
    <td>[% L.input_tag("defaults.assortmentnumber", SELF.defaults.assortmentnumber, size="15") %]</td>
+   [%- END -%]
   </tr>
 
   <tr>
diff --git a/templates/webpages/ic/generate_report_bottom.html b/templates/webpages/ic/generate_report_bottom.html
index c00442576..25009f6d6 100644
--- a/templates/webpages/ic/generate_report_bottom.html
+++ b/templates/webpages/ic/generate_report_bottom.html
@@ -23,10 +23,12 @@
      <td>[%- 'Service (typeabbreviation)'    | $T8 %]</td>
      <td>[%- 'Service'                       | $T8 %]</td>
     </tr>
+    [%- IF INSTANCE_CONF.get_feature_experimental %]
     <tr class="listrow1">
      <td>[%- 'Assortment (typeabbreviation)' | $T8 %]</td>
      <td>[%- 'Assortment'                    | $T8 %]</td>
     </tr>
+    [%- END %]
  </tbody>
  </table></td>
  <td><table valign="top">
diff --git a/templates/webpages/ic/search.html b/templates/webpages/ic/search.html
index 5bd7b5b6f..80be43c6a 100644
--- a/templates/webpages/ic/search.html
+++ b/templates/webpages/ic/search.html
@@ -37,10 +37,12 @@
           <input name="l_assembly" id="l_assembly" class="checkbox" type="checkbox" value="Y" checked>
           <label for="l_assembly">[% 'Assembly' | $T8 %]</label>
         </td>
+        [%- IF INSTANCE_CONF.get_feature_experimental %]
         <td>
           <input name="l_assortment" id="l_assortment" class="checkbox" type="checkbox" value="Y" checked>
           <label for="l_assortment">[% 'Assortment' | $T8 %]</label>
         </td>
+        [%- END %]
        </tr></table></td>
       </tr>
       <tr>