Gloable BCC Adresse

diff --git a/SL/DB/MetaSetup/Default.pm b/SL/DB/MetaSetup/Default.pm
index a5c1d33..bf9e89c 100644 (file)
--- a/SL/DB/MetaSetup/Default.pm
+++ b/SL/DB/MetaSetup/Default.pm
@@ -42,6 +42,7 @@ __PACKAGE__->meta->columns(
   datev_check_on_sales_invoice              => { type => 'boolean', default => 'true' },
   delivery_plan_calculate_transferred_do    => { type => 'boolean', default => 'false', not_null => 1 },
   delivery_plan_show_value_of_goods         => { type => 'boolean', default => 'false', not_null => 1 },
+  disabled_price_sources                    => { type => 'array' },
   dunning_ar                                => { type => 'integer' },
   dunning_ar_amount_fee                     => { type => 'integer' },
   dunning_ar_amount_interest                => { type => 'integer' },
@@ -50,6 +51,7 @@ __PACKAGE__->meta->columns(
   fxgain_accno_id                           => { type => 'integer' },
   fxloss_accno_id                           => { type => 'integer' },
   gl_changeable                             => { type => 'integer', default => 2, not_null => 1 },
+  global_bcc                                => { type => 'text', default => '' },
   id                                        => { type => 'serial', not_null => 1 },
   income_accno_id                           => { type => 'integer' },
   inventory_accno_id                        => { type => 'integer' },

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index dc05f36..e8af23f 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -1000,6 +1000,11 @@ sub edit_e_mail {
   $form->{oldmedia} = $form->{media};
   $form->{media}    = "email";
 
+  my $defaults =
+  my $global_bcc = AM->get_defaults()->{global_bcc};
+
+  $form->{bcc} = join ', ', grep $_, $form->{bcc}, $global_bcc;
+
   my $attachment_filename = $form->generate_attachment_filename();
   my $subject             = $form->{subject} || $form->generate_email_subject();
 

diff --git a/locale/de/all b/locale/de/all
index 3c78fa2..57d4b0b 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1166,6 +1166,7 @@ $self->{texts} = {
   'Generic Tax Report'          => 'USTVA Bericht',
   'Git revision: #1, #2 #3'     => 'Git-Revision: #1, #2 #3',
   'Given Name'                  => 'Vorname',
+  'Global Record BCC'           => 'Globale BCC-Adresse',
   'Go one step back'            => 'Einen Schritt zurück',
   'Go one step forward'         => 'Einen Schritt vorwärts',
   'Greeting'                    => 'Anrede',
@@ -1443,6 +1444,7 @@ $self->{texts} = {
   'Mandate Date of Signature'   => 'Mandat-Unterschriftsdatum',
   'Mandator ID'                 => 'Mandanten-ID',
   'Mandatory Departments'       => 'Benutzer muss Abteilungen vergeben',
+  'Manually sent E-Mails will have their BCC field appended with this address. Will not trigger for employees without the right to send bcc, and will not apply to mails sent by automated jobs.' => 'Diese Mailadresse wird automatisch in das BCC Feld bei Mailversand kopiert. Hat keine Auswirkungen für Mitarbeiter ohne das Recht BCC zu versenden, und ignoriert wenn Mails automatisch versendet werden.',
   'Map'                         => 'Karte',
   'Mar'                         => 'März',
   'March'                       => 'März',

diff --git a/sql/Pg-upgrade2/defaults_global_bcc.sql b/sql/Pg-upgrade2/defaults_global_bcc.sql
new file mode 100644 (file)
index 0000000..bfb32de
--- /dev/null
+++ b/sql/Pg-upgrade2/defaults_global_bcc.sql
@@ -0,0 +1,5 @@
+-- @tag: defaults_global_bcc
+-- @description: Konfigurierbare globale BCC-Adresse
+-- @depends: release_3_1_0
+
+ALTER TABLE defaults ADD COLUMN global_bcc TEXT DEFAULT '';

diff --git a/templates/webpages/client_config/_features.html b/templates/webpages/client_config/_features.html
index 58cccb0..3be3274 100644 (file)
--- a/templates/webpages/client_config/_features.html
+++ b/templates/webpages/client_config/_features.html
@@ -1,4 +1,4 @@
-[%- USE LxERP -%][%- USE L -%][%- USE P -%]
+[%- USE LxERP -%][%- USE L -%][%- USE P -%][%- USE T8 %]
 <div id="features">
  <table>
   <tr><td class="listheading" colspan="4">[% LxERP.t8("WebDAV") %]</td></tr>
@@ -95,6 +95,16 @@
    <td>[% LxERP.t8('If disabled purchase invoices can only be created by conversion from existing requests for quotations, purchase orders and purchase delivery orders.') %]</td>
   </tr>
 
+  <tr><td class="listheading" colspan="4">[% LxERP.t8("E-mail") %]</td></tr>
+
+  <tr>
+   <td align="right">[% LxERP.t8('Global Record BCC') %]</td>
+   <td>
+     [% L.input_tag('defaults.global_bcc', SELF.defaults.global_bcc, style=style) %]
+   </td>
+   <td>[% 'Manually sent E-Mails will have their BCC field appended with this address. Will not trigger for employees without the right to send bcc, and will not apply to mails sent by automated jobs.' | $T8 %]</td>
+  </tr>
+
   <tr><td class="listheading" colspan="4">[% LxERP.t8("Requirement Specs") %]</td></tr>
 
   <tr>