SEPA-Suche: nach Nachrichten-ID suchen können

diff --git a/SL/SEPA.pm b/SL/SEPA.pm
index c62c2ce7d5f4b92ab4d29f3bff81f9758114abf4..94579179bc559ab1def7075adafea7468d1aef77 100644 (file)
--- a/SL/SEPA.pm
+++ b/SL/SEPA.pm
@@ -326,6 +326,17 @@ sub list_exports {
     $joins_sub{$arap} = 1;
   }
 
     $joins_sub{$arap} = 1;
   }
 

+  if ($filter->{message_id}) {
+    push @values, '%' . $filter->{message_id} . '%';
+    push @where,  <<SQL;
+      se.id IN (
+        SELECT sepa_export_id
+        FROM sepa_export_message_ids
+        WHERE message_id ILIKE ?
+      )
+SQL
+  }
+

   if ($filter->{vc}) {
     push @where_sub,  "vc.name ILIKE ?";
     push @values_sub, '%' . $filter->{vc} . '%';
   if ($filter->{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 a6fa2a470a29c0ac3c48c71b8bab29eb8feb6209..1b712a50398a93663e9d6189547a6f468ef27bdc 100755 (executable)
--- 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_${_}"} }
 
   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});
                               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 787259ce4ebc0a34b14420e86d53d0c056b7aed9..c897d962b9df568cf5eab6f3047017430771768f 100755 (executable)
--- 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 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',
   '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 a88d402bef7d999e9937b47cc0bd3ec1b13ebd8c..e9fb9f67b3194cf9bc4b93321a2c575245ca82a1 100644 (file)
--- a/templates/webpages/sepa/bank_transfer_search.html
+++ b/templates/webpages/sepa/bank_transfer_search.html
@@ -17,6 +17,11 @@
      <td><input name="f_invnumber"></td>
     </tr>
 
      <td><input name="f_invnumber"></td>
     </tr>
 

+    <tr>
+     <td align="right">[% LxERP.t8("SEPA message ID") %]</td>
+     <td>[% L.input_tag("f_message_id") %]</td>
+    </tr>
+

     <tr>
      <td align="right">[% 'Export date from' | $T8 %]</td>
      <td>
     <tr>
      <td align="right">[% 'Export date from' | $T8 %]</td>
      <td>