Zahlungsbedingungen: Variablen für BIC, IBAN, Mandats-ID, Mandatsunterschriftsdatum

diff --git a/SL/Form.pm b/SL/Form.pm
index 28e50a2c7ccad97785a4f48783004705e68be9ed..45662f3b0cbcbba3b1cf343e951ae6c04e2298d2 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -1801,6 +1801,10 @@ sub set_payment_options {
   $self->{payment_terms} =~ s/<%account_number%>/$self->{account_number}/g;
   $self->{payment_terms} =~ s/<%bank%>/$self->{bank}/g;
   $self->{payment_terms} =~ s/<%bank_code%>/$self->{bank_code}/g;
   $self->{payment_terms} =~ s/<%account_number%>/$self->{account_number}/g;
   $self->{payment_terms} =~ s/<%bank%>/$self->{bank}/g;
   $self->{payment_terms} =~ s/<%bank_code%>/$self->{bank_code}/g;

+  $self->{payment_terms} =~ s/<\%bic\%>/$self->{bic}/g;
+  $self->{payment_terms} =~ s/<\%iban\%>/$self->{iban}/g;
+  $self->{payment_terms} =~ s/<\%mandate_date_of_signature\%>/$self->{mandate_date_of_signature}/g;
+  $self->{payment_terms} =~ s/<\%mandator_id\%>/$self->{mandator_id}/g;

 
   map { $self->{payment_terms} =~ s/<%${_}%>/$formatted_amounts{$_}/g; } keys %formatted_amounts;
 
 
   map { $self->{payment_terms} =~ s/<%${_}%>/$formatted_amounts{$_}/g; } keys %formatted_amounts;
 

diff --git a/locale/de/all b/locale/de/all
index ab9d2a90003e3aee62eeaff74630dd730a208655..e210794c0cdb0361f20f24bda4358b9d77275828 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -735,7 +735,11 @@ $self->{texts} = {
   'Customer saved!'             => 'Kunde gespeichert!',
   'Customer type'               => 'Kundentyp',
   'Customer variables'          => 'Kundenvariablen',
   'Customer saved!'             => 'Kunde gespeichert!',
   'Customer type'               => 'Kundentyp',
   'Customer variables'          => 'Kundenvariablen',

+  'Customer\'s Mandate Date of Signature' => 'Mandatsunterschriftsdatum des Kunden',
+  'Customer\'s SEPA mandator ID' => 'SEPA-Mandanten-ID des Kunden',

   'Customer\'s current maximum dunning level: #1' => 'Aktuell höchste Mahnstufe des Kunden: #1',
   'Customer\'s current maximum dunning level: #1' => 'Aktuell höchste Mahnstufe des Kunden: #1',

+  'Customer\'s/vendor\'s BIC'   => 'BIC des Kunden/Lieferanten',
+  'Customer\'s/vendor\'s IBAN'  => 'IBAN des Kunden/Lieferanten',

   'Customer/Vendor'             => 'Kunde/Lieferant',
   'Customer/Vendor (database ID)' => 'Kunde/Lieferant (Datenbank-ID)',
   'Customer/Vendor Name'        => 'Kunde/Lieferant',
   'Customer/Vendor'             => 'Kunde/Lieferant',
   'Customer/Vendor (database ID)' => 'Kunde/Lieferant (Datenbank-ID)',
   'Customer/Vendor Name'        => 'Kunde/Lieferant',

diff --git a/templates/webpages/payment_term/form.html b/templates/webpages/payment_term/form.html
index 48cc15a76b2e585a2852ad39f7420fd79195c536..5b5147ef6b4272045f0cc014ebff5672e8fb45fd 100755 (executable)
--- a/templates/webpages/payment_term/form.html
+++ b/templates/webpages/payment_term/form.html
@@ -88,5 +88,9 @@
    <tr><td>&lt;%account_number%&gt;</td><td>[% LxERP.t8("Your account number") %]</td></tr>
    <tr><td>&lt;%bank%&gt;</td><td>[% LxERP.t8("Your bank") %]</td></tr>
    <tr><td>&lt;%bank_code%&gt;</td><td>[% LxERP.t8("Your bank code") %]</td></tr>
    <tr><td>&lt;%account_number%&gt;</td><td>[% LxERP.t8("Your account number") %]</td></tr>
    <tr><td>&lt;%bank%&gt;</td><td>[% LxERP.t8("Your bank") %]</td></tr>
    <tr><td>&lt;%bank_code%&gt;</td><td>[% LxERP.t8("Your bank code") %]</td></tr>

+   <tr><td>&lt;%bic%&gt;</td><td>[% LxERP.t8("Customer's/vendor's BIC") %]</td></tr>
+   <tr><td>&lt;%iban%&gt;</td><td>[% LxERP.t8("Customer's/vendor's IBAN") %]</td></tr>
+   <tr><td>&lt;%mandator_id%&gt;</td><td>[% LxERP.t8("Customer's SEPA mandator ID") %]</td></tr>
+   <tr><td>&lt;%mandate_date_of_signature%&gt;</td><td>[% LxERP.t8("Customer's Mandate Date of Signature") %]</td></tr>

   </table>
  </form>
   </table>
  </form>