From: Moritz Bunkus Date: Fri, 9 Oct 2015 12:54:37 +0000 (+0200) Subject: Zahlungsbedingungen: Variablen für BIC, IBAN, Mandats-ID, Mandatsunterschriftsdatum X-Git-Tag: release-3.4.1~651 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=58cf6232cf56d5181acf11d8ce83945156e4f555;p=kivitendo-erp.git Zahlungsbedingungen: Variablen für BIC, IBAN, Mandats-ID, Mandatsunterschriftsdatum --- diff --git a/SL/Form.pm b/SL/Form.pm index 28e50a2c7..45662f3b0 100644 --- 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/<\%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; diff --git a/locale/de/all b/locale/de/all index ab9d2a900..e210794c0 100755 --- 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\'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/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', diff --git a/templates/webpages/payment_term/form.html b/templates/webpages/payment_term/form.html index 48cc15a76..5b5147ef6 100755 --- a/templates/webpages/payment_term/form.html +++ b/templates/webpages/payment_term/form.html @@ -88,5 +88,9 @@ <%account_number%>[% LxERP.t8("Your account number") %] <%bank%>[% LxERP.t8("Your bank") %] <%bank_code%>[% LxERP.t8("Your bank code") %] + <%bic%>[% LxERP.t8("Customer's/vendor's BIC") %] + <%iban%>[% LxERP.t8("Customer's/vendor's IBAN") %] + <%mandator_id%>[% LxERP.t8("Customer's SEPA mandator ID") %] + <%mandate_date_of_signature%>[% LxERP.t8("Customer's Mandate Date of Signature") %]