Neues Kundenattribut Rechnungsversand per Post -> Deaktiviert E-Mail für Rechnung

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index 952d90e5733c7efddfd0be476db5b3cf52a646c0..88069f3c4fd412054e5c8244500537ad0e682f6c 100644 (file)
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -552,7 +552,10 @@ sub action_show_periodic_invoices_config_dialog {
 
   if ($::form->{customer_id}) {
     $::form->{ALL_CONTACTS} = SL::DB::Manager::Contact->get_all_sorted(where => [ cp_cv_id => $::form->{customer_id} ]);
 
   if ($::form->{customer_id}) {
     $::form->{ALL_CONTACTS} = SL::DB::Manager::Contact->get_all_sorted(where => [ cp_cv_id => $::form->{customer_id} ]);

-    $::form->{email_recipient_invoice_address} = SL::DB::Manager::Customer->find_by(id => $::form->{customer_id})->invoice_mail;
+    my $customer_object = SL::DB::Manager::Customer->find_by(id => $::form->{customer_id});
+    $::form->{postal_invoice}                  = $customer_object->postal_invoice;
+    $::form->{email_recipient_invoice_address} = $::form->{postal_invoice} ? '' : $customer_object->invoice_mail;
+    $config->send_email(0) if $::form->{postal_invoice};

   }
 
   $self->render('oe/edit_periodic_invoices_config', { layout => 0 },
   }
 
   $self->render('oe/edit_periodic_invoices_config', { layout => 0 },

diff --git a/SL/DB/MetaSetup/Customer.pm b/SL/DB/MetaSetup/Customer.pm
index 1daa719e95bb9c4008a2351704ba455c873a9e41..1785a6e2fd2adca2945a9dce051cb7d8d402b541 100644 (file)
--- a/SL/DB/MetaSetup/Customer.pm
+++ b/SL/DB/MetaSetup/Customer.pm
@@ -56,6 +56,7 @@ __PACKAGE__->meta->columns(
   order_lock                => { type => 'boolean', default => 'false' },
   payment_id                => { type => 'integer' },
   phone                     => { type => 'text' },
   order_lock                => { type => 'boolean', default => 'false' },
   payment_id                => { type => 'integer' },
   phone                     => { type => 'text' },

+  postal_invoice            => { type => 'boolean', default => 'false' },

   pricegroup_id             => { type => 'integer' },
   salesman_id               => { type => 'integer' },
   street                    => { type => 'text' },
   pricegroup_id             => { type => 'integer' },
   salesman_id               => { type => 'integer' },
   street                    => { type => 'text' },

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 5a3e66452d026aa4ca8b7c04a0f86b2e2a83d71e..31f9c74c5b6a80235c019a2354bf69781e4f170e 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -411,8 +411,9 @@ sub setup_is_action_bar {
         action => [ t8('E Mail'),
           call     => [ 'kivi.SalesPurchase.show_email_dialog' ],
           checks   => [ 'kivi.validate_form' ],
         action => [ t8('E Mail'),
           call     => [ 'kivi.SalesPurchase.show_email_dialog' ],
           checks   => [ 'kivi.validate_form' ],

-          disabled => !$may_edit_create ? t8('You must not print this invoice.')
-                    : !$form->{id}      ? t8('This invoice has not been posted yet.')
+          disabled => !$may_edit_create       ? t8('You must not print this invoice.')
+                    : !$form->{id}            ? t8('This invoice has not been posted yet.')
+                    : $form->{postal_invoice} ? t8('This customer wants a postal invoices.')

                     :                     undef,
         ],
       ], # end of combobox "Export"
                     :                     undef,
         ],
       ], # end of combobox "Export"


@@ -459,6 +460,9 @@ sub form_header {
   $TMPL_VAR{customer_obj} = SL::DB::Customer->load_cached($form->{customer_id}) if $form->{customer_id};
   $TMPL_VAR{invoice_obj}  = SL::DB::Invoice->load_cached($form->{id})           if $form->{id};
 
   $TMPL_VAR{customer_obj} = SL::DB::Customer->load_cached($form->{customer_id}) if $form->{customer_id};
   $TMPL_VAR{invoice_obj}  = SL::DB::Invoice->load_cached($form->{id})           if $form->{id};
 

+  # only print, no mail
+  $form->{postal_invoice} = $TMPL_VAR{customer_obj}->postal_invoice if ref $TMPL_VAR{customer_obj} eq 'SL::DB::Customer';
+

   my $current_employee   = SL::DB::Manager::Employee->current;
   $form->{employee_id}   = $form->{old_employee_id} if $form->{old_employee_id};
   $form->{salesman_id}   = $form->{old_salesman_id} if $form->{old_salesman_id};
   my $current_employee   = SL::DB::Manager::Employee->current;
   $form->{employee_id}   = $form->{old_employee_id} if $form->{old_employee_id};
   $form->{salesman_id}   = $form->{old_salesman_id} if $form->{old_salesman_id};

diff --git a/locale/de/all b/locale/de/all
index 3d498ee68c370ec292e7e741a03a364ee654ba91..a2b4f0d598d97e886de28cd4926b1b714b7bebfd 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -2480,6 +2480,7 @@ $self->{texts} = {
   'Post Payment'                => 'Zahlung buchen',
   'Post payments'               => 'Zahlungen buchen',
   'Post payments for selected invoices' => 'Zahlungen für ausgewählten Rechnungen buchen',
   'Post Payment'                => 'Zahlung buchen',
   'Post payments'               => 'Zahlungen buchen',
   'Post payments for selected invoices' => 'Zahlungen für ausgewählten Rechnungen buchen',

+  'Postal Invoice'              => 'Rechnung per Post',

   'Posting Configuration'       => 'Buchungskonfiguration',
   'Posting Key'                 => 'BU-Schlüssel',
   'Posting Text'                => 'Buchungstext',
   'Posting Configuration'       => 'Buchungskonfiguration',
   'Posting Key'                 => 'BU-Schlüssel',
   'Posting Text'                => 'Buchungstext',


@@ -3706,6 +3707,7 @@ $self->{texts} = {
   'This could have happened for two reasons:' => 'Dies kann aus zwei Gründen geschehen sein:',
   'This customer has already been added.' => 'Für diesen Kunden ist bereits ein Preis hinzugefügt.',
   'This customer number is already in use.' => 'Diese Kundennummer wird bereits verwendet.',
   'This could have happened for two reasons:' => 'Dies kann aus zwei Gründen geschehen sein:',
   'This customer has already been added.' => 'Für diesen Kunden ist bereits ein Preis hinzugefügt.',
   'This customer number is already in use.' => 'Diese Kundennummer wird bereits verwendet.',

+  'This customer wants a postal invoices.' => 'Dieser Kunde möchte Rechnungen nur per Post.',

   'This discount has since gone down' => 'Dieser Rabatt ist mittlerweile niedriger',
   'This discount has since gone up' => 'Dieser Rabatt ist mittlerweile höher',
   'This discount is only valid for business #1' => 'Dieser Rabatt ist nur für Kunden-/Lieferantentyp #1 gültig',
   'This discount has since gone down' => 'Dieser Rabatt ist mittlerweile niedriger',
   'This discount has since gone up' => 'Dieser Rabatt ist mittlerweile höher',
   'This discount is only valid for business #1' => 'Dieser Rabatt ist nur für Kunden-/Lieferantentyp #1 gültig',

diff --git a/locale/en/all b/locale/en/all
index d796bdc93bbcc422655b9fc502a37f91cf622f36..848be84f4e9a978948daffd1a332d72eb7073ddc 100644 (file)
--- a/locale/en/all
+++ b/locale/en/all
@@ -2480,6 +2480,7 @@ $self->{texts} = {
   'Post Payment'                => '',
   'Post payments'               => '',
   'Post payments for selected invoices' => '',
   'Post Payment'                => '',
   'Post payments'               => '',
   'Post payments for selected invoices' => '',

+  'Postal Invoice'              => '',

   'Posting Configuration'       => '',
   'Posting Key'                 => '',
   'Posting Text'                => '',
   'Posting Configuration'       => '',
   'Posting Key'                 => '',
   'Posting Text'                => '',


@@ -3705,6 +3706,7 @@ $self->{texts} = {
   'This could have happened for two reasons:' => '',
   'This customer has already been added.' => '',
   'This customer number is already in use.' => '',
   'This could have happened for two reasons:' => '',
   'This customer has already been added.' => '',
   'This customer number is already in use.' => '',

+  'This customer wants a postal invoices.' => '',

   'This discount has since gone down' => '',
   'This discount has since gone up' => '',
   'This discount is only valid for business #1' => '',
   'This discount has since gone down' => '',
   'This discount has since gone up' => '',
   'This discount is only valid for business #1' => '',

diff --git a/sql/Pg-upgrade2/customer_add_postal_invoice.sql b/sql/Pg-upgrade2/customer_add_postal_invoice.sql
new file mode 100644 (file)
index 0000000..43a6c0c
--- /dev/null
+++ b/sql/Pg-upgrade2/customer_add_postal_invoice.sql
@@ -0,0 +1,5 @@
+-- @tag: customer_vendor_add_postal_invoice
+-- @description: neue Spalte für "Rechnungsempfang nur per Post" bei Kunden
+-- @depends: release_3_5_6_1
+
+ALTER TABLE customer ADD COLUMN postal_invoice BOOLEAN DEFAULT FALSE;

diff --git a/templates/webpages/customer_vendor/tabs/billing.html b/templates/webpages/customer_vendor/tabs/billing.html
index 43e1789e995d9efb838b62c0d0f2a2bf3f659063..c5d4515e431d21464841649bef41a691512596ee 100644 (file)
--- a/templates/webpages/customer_vendor/tabs/billing.html
+++ b/templates/webpages/customer_vendor/tabs/billing.html
@@ -178,7 +178,8 @@
     [% IF ( SELF.is_customer() ) %]
     <tr>
       <th align="right">[% 'Email of the invoice recipient' | $T8 %]</th>
     [% 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>
+      <td>[% L.input_tag('cv.invoice_mail', SELF.cv.invoice_mail, size = 30) %] <label for="cv_postal_invoice">[% 'Postal Invoice' | $T8 %]</label>
+        [% L.checkbox_tag('cv.postal_invoice', checked = SELF.cv.postal_invoice, for_submit=1) %]</td>

     </tr>
     <tr>
       <th align="right">[% 'Email of the delivery order recipient' | $T8 %]</th>
     </tr>
     <tr>
       <th align="right">[% 'Email of the delivery order recipient' | $T8 %]</th>

diff --git a/templates/webpages/oe/edit_periodic_invoices_config.html b/templates/webpages/oe/edit_periodic_invoices_config.html
index 6669e6cc5693f9154e7c09e73a2658d4e2016b1e..ebfafeb66271125827addc85acfa33a0d2b6080c 100644 (file)
--- a/templates/webpages/oe/edit_periodic_invoices_config.html
+++ b/templates/webpages/oe/edit_periodic_invoices_config.html
@@ -101,7 +101,7 @@
 
     <tr class="rule-before">
      <th align="right">[%- LxERP.t8("Send invoice via email") %]</th>
 
     <tr class="rule-before">
      <th align="right">[%- LxERP.t8("Send invoice via email") %]</th>

-     <td>[% L.checkbox_tag("send_email", onclick => "toggle_send_email_ctrl()", checked=config.send_email) %]</td>
+     <td>[% L.checkbox_tag("send_email", onclick => "toggle_send_email_ctrl()", checked=config.send_email, disabled=postal_invoice) %]</td>

     </tr>
     <tr>
      <th align="right">[%- LxERP.t8("Email of the invoice recipient") %]</th>
     </tr>
     <tr>
      <th align="right">[%- LxERP.t8("Email of the invoice recipient") %]</th>