Rechnungssuche: Spalte Lastschrifteinzug optional anzeigen

diff --git a/SL/AR.pm b/SL/AR.pm
index 2a80dc0a775aca4c82f1ffd170851f79272ee12a..ad38a7f8e76c76d7aba02c1af13ee88832f57e81 100644 (file)
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -461,7 +461,7 @@ sub ar_transactions {
     qq|  a.invoice, a.datepaid, a.notes, a.shipvia, | .
     qq|  a.shippingpoint, a.storno, a.storno_id, a.globalproject_id, | .
     qq|  a.marge_total, a.marge_percent, | .
     qq|  a.invoice, a.datepaid, a.notes, a.shipvia, | .
     qq|  a.shippingpoint, a.storno, a.storno_id, a.globalproject_id, | .
     qq|  a.marge_total, a.marge_percent, | .

-    qq|  a.transaction_description, | .
+    qq|  a.transaction_description, a.direct_debit, | .

     qq|  pr.projectnumber AS globalprojectnumber, | .
     qq|  c.name, c.customernumber, c.country, c.ustid, b.description as customertype, | .
     qq|  c.id as customer_id, | .
     qq|  pr.projectnumber AS globalprojectnumber, | .
     qq|  c.name, c.customernumber, c.country, c.ustid, b.description as customertype, | .
     qq|  c.id as customer_id, | .

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index 88ace44fe5076843f549afaca769735ee9142eea..e43361f474a381082c556869327504b2cea817d6 100644 (file)
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -912,7 +912,7 @@ sub ar_transactions {
   @columns =
     qw(transdate id type invnumber ordnumber cusordnumber name netamount tax amount paid
        datepaid due duedate transaction_description notes salesman employee shippingpoint shipvia
   @columns =
     qw(transdate id type invnumber ordnumber cusordnumber name netamount tax amount paid
        datepaid due duedate transaction_description notes salesman employee shippingpoint shipvia

-       marge_total marge_percent globalprojectnumber customernumber country ustid taxzone payment_terms charts customertype);
+       marge_total marge_percent globalprojectnumber customernumber country ustid taxzone payment_terms charts customertype direct_debit);

 
   my $ct_cvar_configs                 = CVar->get_configs('module' => 'CT');
   my @ct_includeable_custom_variables = grep { $_->{includeable} } @{ $ct_cvar_configs };
 
   my $ct_cvar_configs                 = CVar->get_configs('module' => 'CT');
   my @ct_includeable_custom_variables = grep { $_->{includeable} } @{ $ct_cvar_configs };


@@ -958,10 +958,11 @@ sub ar_transactions {
     'payment_terms'           => { 'text' => $locale->text('Payment Terms'), },
     'charts'                  => { 'text' => $locale->text('Buchungskonto'), },
     'customertype'            => { 'text' => $locale->text('Customer type'), },
     'payment_terms'           => { 'text' => $locale->text('Payment Terms'), },
     'charts'                  => { 'text' => $locale->text('Buchungskonto'), },
     'customertype'            => { 'text' => $locale->text('Customer type'), },

+    'direct_debit'            => { 'text' => $locale->text('direct debit'), },

     %column_defs_cvars,
   );
 
     %column_defs_cvars,
   );
 

-  foreach my $name (qw(id transdate duedate invnumber ordnumber cusordnumber name datepaid employee shippingpoint shipvia transaction_description)) {
+  foreach my $name (qw(id transdate duedate invnumber ordnumber cusordnumber name datepaid employee shippingpoint shipvia transaction_description direct_debit)) {

     my $sortdir                 = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
     $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
   }
     my $sortdir                 = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
     $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
   }


@@ -1078,6 +1079,8 @@ sub ar_transactions {
       $ar->{invoice}    ? $locale->text("Invoice (one letter abbreviation)") :
                           $locale->text("AR Transaction (abbreviation)");
 
       $ar->{invoice}    ? $locale->text("Invoice (one letter abbreviation)") :
                           $locale->text("AR Transaction (abbreviation)");
 

+    $ar->{direct_debit} = $ar->{direct_debit} ? $::locale->text('yes') : $::locale->text('no');
+

     my $row = { };
 
     foreach my $column (@columns) {
     my $row = { };
 
     foreach my $column (@columns) {

diff --git a/templates/webpages/ar/search.html b/templates/webpages/ar/search.html
index 5c56e624c148c708c08357d269910c75a293d712..4e066042a85bd2590d5b191c0bf1b4a653c125ee 100644 (file)
--- a/templates/webpages/ar/search.html
+++ b/templates/webpages/ar/search.html
@@ -222,6 +222,8 @@
            <td nowrap>[% 'Payment Terms' | $T8 %]</td>
            <td align=right><input name="l_charts" id="l_charts" class=checkbox type=checkbox value=Y></td>
            <td nowrap>[% 'Buchungskonto' | $T8 %]</td>
            <td nowrap>[% 'Payment Terms' | $T8 %]</td>
            <td align=right><input name="l_charts" id="l_charts" class=checkbox type=checkbox value=Y></td>
            <td nowrap>[% 'Buchungskonto' | $T8 %]</td>

+           <td align=right><input name="l_direct_debit" id="l_direct_debit" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'direct debit' | $T8 %]</td>

           </tr>
           <tr>
            <td colspan=4 align=left><b>[% 'Customer' | $T8 %] </td>
           </tr>
           <tr>
            <td colspan=4 align=left><b>[% 'Customer' | $T8 %] </td>