From d504954f7e747960cc6deff312474ff8e7e04a71 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Mon, 21 Sep 2015 16:45:20 +0200 Subject: [PATCH] Rechnungssuche: Spalte Lastschrifteinzug optional anzeigen --- SL/AR.pm | 2 +- bin/mozilla/ar.pl | 7 +++++-- templates/webpages/ar/search.html | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/SL/AR.pm b/SL/AR.pm index 2a80dc0a7..ad38a7f8e 100644 --- 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.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, | . diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl index 88ace44fe..e43361f47 100644 --- 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 - 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 }; @@ -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'), }, + 'direct_debit' => { 'text' => $locale->text('direct debit'), }, %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"; } @@ -1078,6 +1079,8 @@ sub ar_transactions { $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) { diff --git a/templates/webpages/ar/search.html b/templates/webpages/ar/search.html index 5c56e624c..4e066042a 100644 --- a/templates/webpages/ar/search.html +++ b/templates/webpages/ar/search.html @@ -222,6 +222,8 @@ [% 'Payment Terms' | $T8 %] [% 'Buchungskonto' | $T8 %] + + [% 'direct debit' | $T8 %] [% 'Customer' | $T8 %] -- 2.20.1