Feature Sortiment als experimentell markiert

diff --git a/doc/changelog b/doc/changelog
index f4bad16fa1a2b559dfc4abdc027454a83c7edb6c..fafae9239dcb7f5b4859aa5eecacab6caef3d93e 100644 (file)
--- 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 53899b6574f8d6cbe36e3d8c27d3dcf74491c093..c520c4b68517335702b9273f33bbfc9176da7daa 100644 (file)
--- 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 31885b84899eaee590570c8d8401e6cc8d28f5eb..b3c2c4f27ea3ec07b76ec464b4bc0aea94032d79 100644 (file)
--- 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 a7cc99343d7e9e166019dc2401e5108a6b22d8b9..758c7d97036313180f726e27c203d4e203478ed9 100644 (file)
--- 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 c004425769c3ec99a1c930c9192b454a3996e951..25009f6d68b27e49e0ddba9524e4ba1a8e1635d1 100644 (file)
--- 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 5bd7b5b6f6f5482a04b4ff7c4ad3e79196dcfe82..80be43c6abe00a8f318a6b4689c57838bf91fed4 100644 (file)
--- 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>