From cc14c2da6eef443c7affa5aaddae20c9f8cbb1dd Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 1 Oct 2015 14:54:07 +0200 Subject: [PATCH] =?utf8?q?SEPA-Suche:=20nach=20Nachrichten-ID=20suchen=20k?= =?utf8?q?=C3=B6nnen?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- SL/SEPA.pm | 11 +++++++++++ bin/mozilla/sepa.pl | 2 +- locale/de/all | 1 + templates/webpages/sepa/bank_transfer_search.html | 5 +++++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/SL/SEPA.pm b/SL/SEPA.pm index c62c2ce7d..94579179b 100644 --- a/SL/SEPA.pm +++ b/SL/SEPA.pm @@ -326,6 +326,17 @@ sub list_exports { $joins_sub{$arap} = 1; } + if ($filter->{message_id}) { + push @values, '%' . $filter->{message_id} . '%'; + push @where, <{vc}) { push @where_sub, "vc.name ILIKE ?"; push @values_sub, '%' . $filter->{vc} . '%'; diff --git a/bin/mozilla/sepa.pl b/bin/mozilla/sepa.pl index a6fa2a470..1b712a503 100755 --- a/bin/mozilla/sepa.pl +++ b/bin/mozilla/sepa.pl @@ -209,7 +209,7 @@ sub bank_transfer_list { my %filter = map +( $_ => $form->{"f_${_}"} ), grep { $form->{"f_${_}"} } - (qw(vc invnumber), + (qw(vc invnumber message_id), map { ("${_}_date_from", "${_}_date_to") } qw(export requested_execution execution)); $filter{executed} = $form->{l_executed} ? 1 : 0 if ($form->{l_executed} != $form->{l_not_executed}); diff --git a/locale/de/all b/locale/de/all index 787259ce4..c897d962b 100755 --- a/locale/de/all +++ b/locale/de/all @@ -2254,6 +2254,7 @@ $self->{texts} = { 'SEPA XML download' => 'SEPA-XML-Download', 'SEPA creditor ID' => 'SEPA-Kreditoren-Identifikation', 'SEPA exports:' => 'SEPA-Exporte:', + 'SEPA message ID' => 'SEPA-Nachrichten-ID', 'SEPA message IDs' => 'SEPA-Nachrichten-IDs', 'SEPA strings' => 'SEPA-Überweisungen', 'Saldo Credit' => 'Saldo Haben', diff --git a/templates/webpages/sepa/bank_transfer_search.html b/templates/webpages/sepa/bank_transfer_search.html index a88d402be..e9fb9f67b 100644 --- a/templates/webpages/sepa/bank_transfer_search.html +++ b/templates/webpages/sepa/bank_transfer_search.html @@ -17,6 +17,11 @@ + + [% LxERP.t8("SEPA message ID") %] + [% L.input_tag("f_message_id") %] + + [% 'Export date from' | $T8 %] -- 2.20.1