Bei SEPA-Überweisungen Verwendungszweke mit "Rechnung" (übersetzt) präfixen

diff --git a/SL/SEPA.pm b/SL/SEPA.pm
index 38341eccd5f9e4ef93c31508659dce6f3da2968c..9a2978314a66e51194747bc6f5b2b77613d451c0 100644 (file)
--- a/SL/SEPA.pm
+++ b/SL/SEPA.pm
@@ -22,7 +22,7 @@ sub retrieve_open_invoices {
   my $query =
     qq|
        SELECT ${arap}.id, ${arap}.invnumber, ${arap}.${vc}_id, ${arap}.amount AS invoice_amount, ${arap}.invoice,
   my $query =
     qq|
        SELECT ${arap}.id, ${arap}.invnumber, ${arap}.${vc}_id, ${arap}.amount AS invoice_amount, ${arap}.invoice,

-         vc.name AS vcname, ${arap}.duedate as duedate,
+         vc.name AS vcname, vc.language_id, ${arap}.duedate as duedate,

 
          COALESCE(vc.iban, '') <> '' AND COALESCE(vc.bic, '') <> '' AS vc_bank_info_ok,
 
 
          COALESCE(vc.iban, '') <> '' AND COALESCE(vc.bic, '') <> '' AS vc_bank_info_ok,
 

diff --git a/bin/mozilla/sepa.pl b/bin/mozilla/sepa.pl
index 7971b7d9d3d67809a0096cab9fb0bbbfd66d94b8..f6041fbcde8a851a825ad5334d298dd943133083 100755 (executable)
--- a/bin/mozilla/sepa.pl
+++ b/bin/mozilla/sepa.pl
@@ -8,6 +8,7 @@ use SL::BankAccount;
 use SL::Chart;
 use SL::CT;
 use SL::Form;
 use SL::Chart;
 use SL::CT;
 use SL::Form;

+use SL::GenericTranslations;

 use SL::ReportGenerator;
 use SL::SEPA;
 use SL::SEPA::XML;
 use SL::ReportGenerator;
 use SL::SEPA;
 use SL::SEPA::XML;


@@ -41,6 +42,15 @@ sub bank_transfer_add {
 
   my $bank_account_label_sub = sub { $locale->text('Account number #1, bank code #2, #3', $_[0]->{account_number}, $_[0]->{bank_code}, $_[0]->{bank}) };
 
 
   my $bank_account_label_sub = sub { $locale->text('Account number #1, bank code #2, #3', $_[0]->{account_number}, $_[0]->{bank_code}, $_[0]->{bank}) };
 

+  my $translation_list = GenericTranslations->list(translation_type => 'sepa_remittance_info_pfx');
+  my %translations     = map { ( ($_->{language_id} || 'default') => $_->{translation} ) } @{ $translation_list };
+
+  foreach my $invoice (@{ $invoices }) {
+    my $prefix                    = $translations{ $invoice->{language_id} } || $translations{default} || $::locale->text('Invoice');
+    $prefix                      .= ' ' unless $prefix =~ m/ $/;
+    $invoice->{reference_prefix}  = $prefix;
+  }
+

   $form->header();
   print $form->parse_html_template('sepa/bank_transfer_add',
                                    { 'INVOICES'           => $invoices,
   $form->header();
   print $form->parse_html_template('sepa/bank_transfer_add',
                                    { 'INVOICES'           => $invoices,

diff --git a/templates/webpages/sepa/bank_transfer_add.html b/templates/webpages/sepa/bank_transfer_add.html
index 0954d1dbc1f9f302657b20185b572a608f9d3cb2..56d36d042df8acd6a8c912760f5594de2df537c8 100644 (file)
--- a/templates/webpages/sepa/bank_transfer_add.html
+++ b/templates/webpages/sepa/bank_transfer_add.html
@@ -73,7 +73,7 @@
       <td align="right">[% LxERP.format_amount(invoice.invoice_amount, -2) %]</td>
       <td align="right">[% LxERP.format_amount(invoice.open_amount, -2) %]</td>
       <td align="right">[% invoice.duedate %]</td>
       <td align="right">[% LxERP.format_amount(invoice.invoice_amount, -2) %]</td>
       <td align="right">[% LxERP.format_amount(invoice.open_amount, -2) %]</td>
       <td align="right">[% invoice.duedate %]</td>

-      <td><input name="bank_transfers[].reference" value="[% HTML.escape(invoice.invnumber) %]"></td>
+      <td><input name="bank_transfers[].reference" value="[% HTML.escape(invoice.reference_prefix _ invoice.invnumber) %]"></td>

       <td align="right">
        <input name="bank_transfers[].amount" value="[% LxERP.format_amount(invoice.invoice_amount, -2) %]" style="text-align: right">
       </td>
       <td align="right">
        <input name="bank_transfers[].amount" value="[% LxERP.format_amount(invoice.invoice_amount, -2) %]" style="text-align: right">
       </td>