new settings balance, datev, erfolgsrechnung, eurechnung, ustva to client-features

diff --git a/SL/DB/MetaSetup/Default.pm b/SL/DB/MetaSetup/Default.pm
index 96c4b0f1fff0bf67b844187013dbf12eae92f743..bd02674dd65839806b4e0073f041ee01b8dcff40 100644 (file)
--- a/SL/DB/MetaSetup/Default.pm
+++ b/SL/DB/MetaSetup/Default.pm
@@ -49,6 +49,11 @@ __PACKAGE__->meta->columns(
   duns                                      => { type => 'text' },
   email_journal                             => { type => 'integer', default => 2 },
   expense_accno_id                          => { type => 'integer' },
+  feature_balance                           => { type => 'boolean', default => 'true', not_null => 1 },
+  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_ustva                             => { type => 'boolean', default => 'true', not_null => 1 },
   fxgain_accno_id                           => { type => 'integer' },
   fxloss_accno_id                           => { type => 'integer' },
   gl_changeable                             => { type => 'integer', default => 2, not_null => 1 },

diff --git a/locale/de/all b/locale/de/all
index d051a8dababb04859df9a791e7476cb5ff86c48a..025b9e84232246f9912fe6cc4bf4ec967f3c02eb 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -3238,6 +3238,11 @@ $self->{texts} = {
   'Uploaded at'                 => 'Hochgeladen um',
   'Uploaded on #1, size #2 kB'  => 'Am #1 hochgeladen, Größe #2 kB',
   'Use As New'                  => 'Als neu verwenden',
+  'Use Balance Sheet'           => 'Bilanz verwenden',
+  'Use Datevautomatik'          => 'Datev-Automatik verwenden',
+  'Use Income'                  => 'Einnahmen-Überschuß-Rechnung verwenden',
+  'Use Erfolgsrechnung'         => 'Erfolgsrechnung verwenden',
+  'Use UStVA'                   => 'UStVA verwenden',
   'Use WebDAV Repository'       => 'WebDAV-Ablage verwenden',
   'Use existing templates'      => 'Vorhandene Druckvorlagen verwenden',
   'Use linked items'            => 'Verknüpfte Positionen verwenden',

diff --git a/sql/Pg-upgrade2/defaults_add_features.sql b/sql/Pg-upgrade2/defaults_add_features.sql
new file mode 100644 (file)
index 0000000..897082c
--- /dev/null
+++ b/sql/Pg-upgrade2/defaults_add_features.sql
@@ -0,0 +1,8 @@
+-- @tag: defaults_add_features
+-- @description: flags to switch on/off the features for the clients
+-- @depends: release_3_3_0
+ALTER TABLE defaults ADD COLUMN feature_balance BOOLEAN NOT NULL DEFAULT TRUE;
+ALTER TABLE defaults ADD COLUMN feature_datev BOOLEAN NOT NULL DEFAULT TRUE;
+ALTER TABLE defaults ADD COLUMN feature_erfolgsrechnung BOOLEAN NOT NULL DEFAULT FALSE;
+ALTER TABLE defaults ADD COLUMN feature_eurechnung BOOLEAN NOT NULL DEFAULT TRUE;
+ALTER TABLE defaults ADD COLUMN feature_ustva BOOLEAN NOT NULL DEFAULT TRUE;

diff --git a/templates/webpages/client_config/_features.html b/templates/webpages/client_config/_features.html
index 0a06d43e08d5d382aa5b6cb04910c9f241174851..c95c6e5db974591d1e7ef442ba10c5fdefe6a34e 100644 (file)
--- a/templates/webpages/client_config/_features.html
+++ b/templates/webpages/client_config/_features.html
@@ -1,6 +1,22 @@
 [%- USE LxERP -%][%- USE L -%][%- USE P -%][%- USE T8 %]
 <div id="features">
  <table>
+  <tr><td class="listheading" colspan="4">[% LxERP.t8("DATEV") %]</td></tr>
+
+  <tr>
+   <td align="right">[% LxERP.t8('Datevautomatik') %]</td>
+   <td>[% L.yes_no_tag('defaults.feature_datev', SELF.defaults.feature_datev) %]</td>
+   <td>[% LxERP.t8('Use Datevautomatik') %]</td>
+  </tr>
+
+  <tr><td class="listheading" colspan="4">[% LxERP.t8("UStVA") %]</td></tr>
+
+  <tr>
+   <td align="right">[% LxERP.t8('UStVA') %]</td>
+   <td>[% L.yes_no_tag('defaults.feature_ustva', SELF.defaults.feature_ustva) %]</td>
+   <td>[% LxERP.t8('Use UStVA') %]</td>
+  </tr>
+
   <tr><td class="listheading" colspan="4">[% LxERP.t8("WebDAV") %]</td></tr>
 
   <tr>
@@ -14,6 +30,24 @@
    <td>[% LxERP.t8('Save document in WebDAV repository') %]</td>
   </tr>
 
+  <tr><td class="listheading" colspan="4">[% LxERP.t8("Reports") %]</td></tr>
+
+  <tr>
+   <td align="right">[% LxERP.t8('Balance') %]</td>
+   <td>[% L.yes_no_tag('defaults.feature_balance', SELF.defaults.feature_balance) %]</td>
+   <td>[% LxERP.t8('Use Balance Sheet') %]</td>
+  </tr>
+  <tr>
+   <td align="right">[% LxERP.t8('income') %]</td>
+   <td>[% L.yes_no_tag('defaults.feature_eurechnung', SELF.defaults.feature_eurechnung) %]</td>
+   <td>[% LxERP.t8('Use Income') %]</td>
+  </tr>
+  <tr>
+   <td align="right">[% LxERP.t8('Erfolgsrechnung') %]</td>
+   <td>[% L.yes_no_tag('defaults.feature_erfolgsrechnung', SELF.defaults.feature_erfolgsrechnung) %]</td>
+   <td>[% LxERP.t8('Use Erfolgsrechnung') %]</td>
+  </tr>
+
   <tr><td class="listheading" colspan="4">[% LxERP.t8("Customer Master Data") %]</td></tr>
 
   <tr>