From: Jan Büren <jan@kivitendo.de>
Date: Fri, 14 Sep 2018 08:43:02 +0000 (+0200)
Subject: Stammdaten -> Kunden um Textfelder Rechnungsmail und Herkunft personenbezogener Daten... 
X-Git-Tag: release-3.5.4~177
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=0a076aab24a128483e595e58ec06bc2e298cf7cb;p=kivitendo-erp.git

Stammdaten -> Kunden um Textfelder Rechnungsmail und Herkunft personenbezogener Daten erweitert

i)
Die Rechnungsmail ist die generische E-Mail des Kunden, welche die
Rechnung in der Regel bearbeitet (buchhaltung@, einkauf@).
ii)
Aufgrund der DSGVO ist es im Zweifel sinnvoll den Erstkontakt
des Kunden zu dokumentieren (Messe xyz, Telefon-Aktion beta, ...)
Die beiden Felder sind als Suchfeld anhakbar.
---

diff --git a/SL/DB/MetaSetup/Customer.pm b/SL/DB/MetaSetup/Customer.pm
index 1bf34fbdc..01b2b63e9 100644
--- a/SL/DB/MetaSetup/Customer.pm
+++ b/SL/DB/MetaSetup/Customer.pm
@@ -23,6 +23,7 @@ __PACKAGE__->meta->columns(
   creditlimit               => { type => 'numeric', default => '0', precision => 15, scale => 5 },
   currency_id               => { type => 'integer', not_null => 1 },
   customernumber            => { type => 'text' },
+  contact_origin            => { type => 'text' },
   delivery_term_id          => { type => 'integer' },
   department_1              => { type => 'text' },
   department_2              => { type => 'text' },
@@ -38,6 +39,7 @@ __PACKAGE__->meta->columns(
   iban                      => { type => 'text' },
   id                        => { type => 'integer', not_null => 1, sequence => 'id' },
   itime                     => { type => 'timestamp', default => 'now()' },
+  invoice_mail              => { type => 'text' },
   language                  => { type => 'text' },
   language_id               => { type => 'integer' },
   mandate_date_of_signature => { type => 'date' },
diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index 558e52445..c9d6539e3 100644
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -177,7 +177,7 @@ sub list_names {
     'id',        'name',    "$form->{db}number",   'contact',   'phone',    'discount',
     'fax',       'email',   'taxnumber',           'street',    'zipcode' , 'city',
     'business',  'payment', 'invnumber', 'ordnumber',           'quonumber', 'salesman',
-    'country',   'gln',     'insertdate',           'pricegroup'
+    'country',   'gln',     'insertdate',           'pricegroup', 'contact_origin', 'invoice_mail'
   );
 
   my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs };
@@ -210,6 +210,8 @@ sub list_names {
     'payment'           => { 'text' => $locale->text('Payment Terms'), },
     'insertdate'        => { 'text' => $locale->text('Insert Date'), },
     'pricegroup'        => { 'text' => $locale->text('Pricegroup'), },
+    'invoice_mail'      => { 'text' => $locale->text('Email of the invoice recipient'), },
+    'contact_origin'    => { 'text' => $locale->text('Origin of personal data'), },
     %column_defs_cvars,
   );
 
diff --git a/locale/de/all b/locale/de/all
index 0967e474e..ccc672597 100755
--- a/locale/de/all
+++ b/locale/de/all
@@ -1221,6 +1221,7 @@ $self->{texts} = {
   'Element disabled'            => 'Element deaktiviert',
   'Email'                       => 'E-Mail',
   'Email journal'               => 'E-Mail-Journal',
+  'Email of the invoice recipient' => 'E-Mail des Rechnungsempfängers',
   'Employee'                    => 'Bearbeiter',
   'Employee #1 saved!'          => 'Benutzer #1 gespeichert!',
   'Employee (database ID)'      => 'Bearbeiter (Datenbank-ID)',
@@ -2146,6 +2147,7 @@ $self->{texts} = {
   'Orders to fetch'             => 'Anzahl Bestellungen holen',
   'Orientation'                 => 'Seitenformat',
   'Orig. Size w/h'              => 'Orig. Größe b/h',
+  'Origin of personal data'     => 'Herkunft der personenbezogenen Daten',
   'Orphaned'                    => 'Nie benutzt',
   'Orphaned currencies'         => 'Verwaiste Währungen',
   'Other Matches'               => 'Andere Treffer',
diff --git a/sql/Pg-upgrade2/customer_add_fields.sql b/sql/Pg-upgrade2/customer_add_fields.sql
new file mode 100644
index 000000000..5bfd622e3
--- /dev/null
+++ b/sql/Pg-upgrade2/customer_add_fields.sql
@@ -0,0 +1,5 @@
+-- @tag: customer_add_fields
+-- @description: Rechnungsadresse (E-Mail-Empfänger) Herkunft der personenbezogenen Daten
+-- @depends: release_3_5_3
+ALTER TABLE customer ADD COLUMN invoice_mail text;
+ALTER TABLE customer ADD COLUMN contact_origin text;
diff --git a/templates/webpages/ct/search.html b/templates/webpages/ct/search.html
index 988089d9d..81f402d89 100644
--- a/templates/webpages/ct/search.html
+++ b/templates/webpages/ct/search.html
@@ -206,6 +206,14 @@
         <input name="l_pricegroup" id="l_pricegroup" type="checkbox" class="checkbox" value="Y">
         <label for="l_pricegroup">[% 'Pricegroup' | $T8 %]</label>
        </td>
+       <td>
+        <input name="l_contact_origin" id="l_contact_origin" type="checkbox" class="checkbox" value="Y">
+        <label for="l_contact_origin">[% 'Origin of personal data' | $T8 %]</label>
+       </td>
+       <td>
+        <input name="l_invoice_mail" id="l_invoice_mail" type="checkbox" class="checkbox" value="Y">
+        <label for="l_invoice_mail">[% 'Email of the invoice recipient' | $T8 %]</label>
+       </td>
       </tr>
       [% END %]
 
diff --git a/templates/webpages/customer_vendor/tabs/billing.html b/templates/webpages/customer_vendor/tabs/billing.html
index 3364df12d..6981c59e7 100644
--- a/templates/webpages/customer_vendor/tabs/billing.html
+++ b/templates/webpages/customer_vendor/tabs/billing.html
@@ -169,7 +169,12 @@
         [% L.input_tag('cv.bcc', SELF.cv.bcc, size = 45) %]
       </td>
     </tr>
-
+    [% IF ( SELF.is_customer() ) %]
+    <tr>
+      <th align="right">[% 'Email of the invoice recipient' | $T8 %]</th>
+      <td>[% L.input_tag('cv.invoice_mail', SELF.cv.invoice_mail, size = 45) %]</td>
+    </tr>
+    [% END %]
     <tr>
       <th align="right" nowrap>
         [% IF SELF.cv.homepage %]
@@ -364,12 +369,19 @@
   <table>
     <tr>
       <th align="left" nowrap>[% 'Internal Notes' | $T8 %]</th>
+    [% IF ( SELF.is_customer() ) %]
+      <th align="left">[% 'Origin of personal data' | $T8 %]</th>
+    [% END %]
     </tr>
-
     <tr>
       <td>
         [% L.textarea_tag('cv.notes', SELF.cv.notes, rows = 3 cols = 60 wrap = soft) %]
       </td>
+    [% IF ( SELF.is_customer() ) %]
+      <td>
+        [% L.textarea_tag('cv.contact_origin', SELF.cv.contact_origin,  rows = 3 cols = 60 wrap = soft) %]
+      </td>
+    [% END %]
     </tr>
   </table>
 </div>