Rechnungen: Nach »als geschlossen markiert« suchen

diff --git a/SL/AR.pm b/SL/AR.pm
index 56f2da9dfa61e63b59cd8c4096faf692b1053628..4f150673beb12fda4eea126036edb3165193bdf2 100644 (file)
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -599,6 +599,20 @@ SQL
     push @values, like($form->{parts_description});
   }
 
     push @values, like($form->{parts_description});
   }
 

+  if ($form->{show_marked_as_closed}) {
+    $query .= '
+      LEFT JOIN (
+              SELECT SUM(acc_trans.amount) AS amount, trans_id
+              FROM acc_trans
+              LEFT JOIN chart ON chart.id = chart_id
+              WHERE chart.link ILIKE ?
+              GROUP BY trans_id
+      ) AS paid_difference ON (paid_difference.trans_id = a.id)
+    ';
+    unshift @values, '%AR_paid%';
+    $where .= ' AND COALESCE(paid_difference.amount, 0) + a.paid != 0';
+  }
+

   my ($cvar_where, @cvar_values) = CVar->build_filter_query('module'         => 'CT',
                                                             'trans_id_field' => 'c.id',
                                                             'filter'         => $form,
   my ($cvar_where, @cvar_values) = CVar->build_filter_query('module'         => 'CT',
                                                             'trans_id_field' => 'c.id',
                                                             'filter'         => $form,

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index ec028e886dfc52bcc046256fa3042c83ebed93e9..5f290f6535698c7776307e67050beaacaae4d44c 100644 (file)
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -996,7 +996,7 @@ sub ar_transactions {
 
   my @hidden_variables = map { "l_${_}" } @columns;
   push @hidden_variables, "l_subtotal", qw(open closed customer invnumber ordnumber cusordnumber transaction_description notes project_id transdatefrom transdateto duedatefrom duedateto
 
   my @hidden_variables = map { "l_${_}" } @columns;
   push @hidden_variables, "l_subtotal", qw(open closed customer invnumber ordnumber cusordnumber transaction_description notes project_id transdatefrom transdateto duedatefrom duedateto

-                                           employee_id salesman_id business_id parts_partnumber parts_description department_id);
+                                           employee_id salesman_id business_id parts_partnumber parts_description department_id show_marked_as_closed);

   push @hidden_variables, map { "cvar_$_->{name}" } @ct_searchable_custom_variables;
 
   $href = build_std_url('action=ar_transactions', grep { $form->{$_} } @hidden_variables);
   push @hidden_variables, map { "cvar_$_->{name}" } @ct_searchable_custom_variables;
 
   $href = build_std_url('action=ar_transactions', grep { $form->{$_} } @hidden_variables);

diff --git a/locale/de/all b/locale/de/all
index 63aaf24169cc599dad9e7ce14e5334ea47defe74..6a050b52f3b756ace3c94ad130ed1e5eba56ec74 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -2710,6 +2710,7 @@ $self->{texts} = {
   'Show items from invoices individually' => 'Artikel aus Rechnungen anzeigen',
   'Show mappings (csv_import)'  => 'Spaltenzuordnungen anzeigen',
   'Show old dunnings'           => 'Alte Mahnungen anzeigen',
   'Show items from invoices individually' => 'Artikel aus Rechnungen anzeigen',
   'Show mappings (csv_import)'  => 'Spaltenzuordnungen anzeigen',
   'Show old dunnings'           => 'Alte Mahnungen anzeigen',

+  'Show only marked as paid invoices' => 'Nur "als geschlossen markiert" zeigen',

   'Show overdue sales quotations and requests for quotations...' => 'Überfällige Angebote und Preisanfragen anzeigen...',
   'Show parts'                  => 'Artikel anzeigen',
   'Show parts longdescription (notes) in select list' => 'Langtext in Auswahlliste bei mehreren Treffern im Stammdaten-Bestand anzeigen',
   'Show overdue sales quotations and requests for quotations...' => 'Überfällige Angebote und Preisanfragen anzeigen...',
   'Show parts'                  => 'Artikel anzeigen',
   'Show parts longdescription (notes) in select list' => 'Langtext in Auswahlliste bei mehreren Treffern im Stammdaten-Bestand anzeigen',

diff --git a/templates/webpages/ar/search.html b/templates/webpages/ar/search.html
index 1c0b9e60ab24301688a819dd6e089ec092f9687e..f3b7aa2fc52a2e2724459fc053e6cfe18537bf2b 100644 (file)
--- a/templates/webpages/ar/search.html
+++ b/templates/webpages/ar/search.html
@@ -64,6 +64,10 @@
       <td>[% L.select_tag("business_id", ALL_BUSINESS_TYPES, with_empty=1, title_key="description", style=style) %]</td>
      </tr>
     [% END %]
       <td>[% L.select_tag("business_id", ALL_BUSINESS_TYPES, with_empty=1, title_key="description", style=style) %]</td>
      </tr>
     [% END %]

+     <tr>
+      <th>[% 'Show only marked as paid invoices' | $T8 %]</th>
+      <td>[% L.checkbox_tag('show_marked_as_closed') %]</td>
+     </tr>

      <tr>
       <th align=right nowrap>[% 'Invoice Date' | $T8 %]</th>
       <td>
      <tr>
       <th align=right nowrap>[% 'Invoice Date' | $T8 %]</th>
       <td>