From 77500e117c3498b3401b197dda0e717b5caf059d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bernd=20Ble=C3=9Fmann?= <bernd@kivitendo-premium.de>
Date: Wed, 19 Apr 2017 14:26:29 +0200
Subject: [PATCH] =?utf8?q?Mandantenkonfiguration:=20Schalter=20f=C3=BCr=20?=
 =?utf8?q?experimentelle=20Features?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

- neue Spalte in defaults (Upgrade-Skript und Rose-Update)
- Schalter in der Mandantenkonfiguration
- Übersetzungen
---
 SL/DB/MetaSetup/Default.pm                            | 1 +
 locale/de/all                                         | 3 +++
 locale/en/all                                         | 3 +++
 sql/Pg-upgrade2/defaults_add_feature_experimental.sql | 5 +++++
 templates/webpages/client_config/_features.html       | 8 ++++++++
 5 files changed, 20 insertions(+)
 create mode 100644 sql/Pg-upgrade2/defaults_add_feature_experimental.sql

diff --git a/SL/DB/MetaSetup/Default.pm b/SL/DB/MetaSetup/Default.pm
index d674c1ad8..85954739d 100644
--- a/SL/DB/MetaSetup/Default.pm
+++ b/SL/DB/MetaSetup/Default.pm
@@ -73,6 +73,7 @@ __PACKAGE__->meta->columns(
   feature_datev                             => { type => 'boolean', default => 'true', not_null => 1 },
   feature_erfolgsrechnung                   => { type => 'boolean', default => 'false', not_null => 1 },
   feature_eurechnung                        => { type => 'boolean', default => 'true', not_null => 1 },
+  feature_experimental                      => { type => 'boolean', default => 'true', not_null => 1 },
   feature_ustva                             => { type => 'boolean', default => 'true', not_null => 1 },
   fxgain_accno_id                           => { type => 'integer' },
   fxloss_accno_id                           => { type => 'integer' },
diff --git a/locale/de/all b/locale/de/all
index 1fe744d35..563e5eb6a 100755
--- a/locale/de/all
+++ b/locale/de/all
@@ -1175,6 +1175,7 @@ $self->{texts} = {
   'Employees'                   => 'Benutzer',
   'Empty selection for warehouse will not be added, even if the old bin is still visible (use back and forth to edit again).' => 'Leere Lager-Auswahl wird ignoriert, selbst wenn noch ein Lagerplatz ausgewählt ist. Alle Daten können durch zurück und vorwärts korrigiert werden.',
   'Empty transaction!'          => 'Buchung ist leer!',
+  'Enable experimental features' => 'Experimentelle Features einschalten',
   'Enabled Quick Searched'      => 'Aktivierte Schnellsuchen',
   'Enabled modules'             => 'Aktivierte Module',
   'End date'                    => 'Enddatum',
@@ -1298,6 +1299,8 @@ $self->{texts} = {
   'Expense'                     => 'Aufwandskonto',
   'Expense Account'             => 'Aufwandskonto',
   'Expense/Asset'               => 'Aufwand/Anlagen',
+  'Experimental Features'       => 'Experimentelle Features',
+  'Experimental features are:'  => 'Experimentelle Features sind:',
   'Export'                      => 'Export',
   'Export Buchungsdaten'        => 'Export Buchungsdaten',
   'Export Number'               => 'Exportnummer',
diff --git a/locale/en/all b/locale/en/all
index dd67f2906..bbd38272c 100644
--- a/locale/en/all
+++ b/locale/en/all
@@ -1175,6 +1175,7 @@ $self->{texts} = {
   'Employees'                   => '',
   'Empty selection for warehouse will not be added, even if the old bin is still visible (use back and forth to edit again).' => '',
   'Empty transaction!'          => '',
+  'Enable experimental features' => '',
   'Enabled Quick Searched'      => '',
   'Enabled modules'             => '',
   'End date'                    => '',
@@ -1298,6 +1299,8 @@ $self->{texts} = {
   'Expense'                     => '',
   'Expense Account'             => '',
   'Expense/Asset'               => '',
+  'Experimental Features'       => '',
+  'Experimental features are:'  => '',
   'Export'                      => '',
   'Export Buchungsdaten'        => '',
   'Export Number'               => '',
diff --git a/sql/Pg-upgrade2/defaults_add_feature_experimental.sql b/sql/Pg-upgrade2/defaults_add_feature_experimental.sql
new file mode 100644
index 000000000..a1a429ec5
--- /dev/null
+++ b/sql/Pg-upgrade2/defaults_add_feature_experimental.sql
@@ -0,0 +1,5 @@
+-- @tag: defaults_add_feature_experimental
+-- @description: Konfigurations-Option, ob experimentelle Features verwendet werden sollen.
+-- @depends: release_3_4_1
+
+ALTER TABLE defaults ADD COLUMN feature_experimental BOOLEAN NOT NULL DEFAULT TRUE;
diff --git a/templates/webpages/client_config/_features.html b/templates/webpages/client_config/_features.html
index 44c158f3e..31885b848 100644
--- a/templates/webpages/client_config/_features.html
+++ b/templates/webpages/client_config/_features.html
@@ -299,5 +299,13 @@
    <td align="right">[% LxERP.t8('Add Customer/Vendor Number as a reference add-on for SEPA export.') %]</td>
    <td>[% L.yes_no_tag('defaults.sepa_reference_add_vc_vc_id', SELF.defaults.sepa_reference_add_vc_vc_id) %]</td>
   </tr>
+
+  <tr><td class="listheading" colspan="4">[% LxERP.t8("Experimental Features") %]</td></tr>
+  <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>
+  </tr>
+
  </table>
 </div>
-- 
2.20.1