SEPA-Einzug: Rechnungen mit gesetztem "Lastschrifteinzug" vorauswählen

diff --git a/SL/SEPA.pm b/SL/SEPA.pm
index d2eb13fffe6806508fb989b5cbf9b3b2ca56f276..311b58e338d82825e3638e1b1aa72d0f6a234178 100644 (file)
--- a/SL/SEPA.pm
+++ b/SL/SEPA.pm
@@ -18,11 +18,12 @@ sub retrieve_open_invoices {
   my $dbh      = $params{dbh} || $form->get_standard_dbh($myconfig);
   my $arap     = $params{vc} eq 'customer' ? 'ar'       : 'ap';
   my $vc       = $params{vc} eq 'customer' ? 'customer' : 'vendor';
   my $dbh      = $params{dbh} || $form->get_standard_dbh($myconfig);
   my $arap     = $params{vc} eq 'customer' ? 'ar'       : 'ap';
   my $vc       = $params{vc} eq 'customer' ? 'customer' : 'vendor';

+  my $extra_columns = $arap  eq 'ar' ? 'ar.direct_debit, ' : '';

 
   my $query =
     qq|
        SELECT ${arap}.id, ${arap}.invnumber, ${arap}.${vc}_id as vc_id, ${arap}.amount AS invoice_amount, ${arap}.invoice,
 
   my $query =
     qq|
        SELECT ${arap}.id, ${arap}.invnumber, ${arap}.${vc}_id as vc_id, ${arap}.amount AS invoice_amount, ${arap}.invoice,

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

 
          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 ce334b28a1d697b67338196f95a1dbfa47b69bda..40d2dff79f4b62864f26527783855cd5b4598fbb 100755 (executable)
--- a/bin/mozilla/sepa.pl
+++ b/bin/mozilla/sepa.pl
@@ -40,6 +40,8 @@ sub bank_transfer_add {
     return;
   }
 
     return;
   }
 

+  $_->{checked} = $_->{direct_debit} for @{ $invoices };
+

   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 $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');

diff --git a/templates/webpages/sepa/bank_transfer_add.html b/templates/webpages/sepa/bank_transfer_add.html
index 58a7af6b9980faef9b209c937410ab2cb1bc9868..575aeeabaf599ffb7f7b2379d6b89caaf1555d21 100644 (file)
--- a/templates/webpages/sepa/bank_transfer_add.html
+++ b/templates/webpages/sepa/bank_transfer_add.html
@@ -47,7 +47,7 @@
      <tr class="listrow[% loop.count % 2 %]">
       <td align="center">
        [%- IF invoice.vc_bank_info_ok %]
      <tr class="listrow[% loop.count % 2 %]">
       <td align="center">
        [%- IF invoice.vc_bank_info_ok %]

-        <input type="checkbox" name="bank_transfers[].selected" value="1">
+        <input type="checkbox" name="bank_transfers[].selected" value="1"[% IF invoice.checked %] checked[% END %]>

        [%- END %]
       </td>
       <td>
        [%- END %]
       </td>
       <td>