Verkauf->Rechnungsbericht Filter nach nicht per E-Mail verschickten Belegen

diff --git a/SL/AR.pm b/SL/AR.pm
index e227eb6e1360c270f625132fc0a9e38ba2256dd3..0c8f842b315d2fe21e3bcbe221f877083d1f5449 100644 (file)
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -620,6 +620,18 @@ SQL
     push @values, like($form->{parts_description});
   }
 
     push @values, like($form->{parts_description});
   }
 

+  if ($form->{show_not_mailed}) {
+    $where .= <<SQL;
+      AND NOT EXISTS (
+        SELECT rl.to_id
+        FROM record_links rl
+        WHERE (rl.from_id = a.id)
+          AND (rl.to_table = 'email_journal')
+        LIMIT 1
+      )
+SQL
+  }
+

   if ($form->{show_marked_as_closed}) {
     $query .= '
       LEFT JOIN (
   if ($form->{show_marked_as_closed}) {
     $query .= '
       LEFT JOIN (

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index 0ea557d27d0ca91296f3fa569aff9397d24ff35d..3706598fb2f9c91e2c1968aa80bd5db7d04e6ade 100644 (file)
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -1000,7 +1000,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 show_marked_as_closed);
+                                           employee_id salesman_id business_id parts_partnumber parts_description department_id show_marked_as_closed show_not_mailed);

   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 9bfd60f9c98dd1b974bd6e2d0cd1e89a0d10f2a0..1020aa5c1f3b2737ed6d5be1816f27ba22f9652c 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -2911,6 +2911,7 @@ $self->{texts} = {
   'Show mappings (csv_import)'  => 'Spaltenzuordnungen anzeigen',
   'Show old dunnings'           => 'Alte Mahnungen anzeigen',
   'Show only marked as paid invoices' => 'Nur "als geschlossen markiert" zeigen',
   'Show mappings (csv_import)'  => 'Spaltenzuordnungen anzeigen',
   'Show old dunnings'           => 'Alte Mahnungen anzeigen',
   'Show only marked as paid invoices' => 'Nur "als geschlossen markiert" zeigen',

+  'Show only not mailed invoices' => 'Nur "nicht per E-Mail versendete" anzeigen',

   'Show order'                  => 'Bestellung anzeigen',
   'Show overdue sales quotations and requests for quotations...' => 'Überfällige Angebote und Preisanfragen anzeigen...',
   'Show parts'                  => 'Artikel anzeigen',
   'Show order'                  => 'Bestellung anzeigen',
   'Show overdue sales quotations and requests for quotations...' => 'Überfällige Angebote und Preisanfragen anzeigen...',
   'Show parts'                  => 'Artikel anzeigen',

diff --git a/templates/webpages/ar/search.html b/templates/webpages/ar/search.html
index c32800377d9d6706e27d09e5e55ef993bed9c70a..2000b8ca4c172f8b75f9b1214198c2df472638e7 100644 (file)
--- a/templates/webpages/ar/search.html
+++ b/templates/webpages/ar/search.html
@@ -68,6 +68,12 @@
       <th>[% 'Show only marked as paid invoices' | $T8 %]</th>
       <td>[% L.checkbox_tag('show_marked_as_closed') %]</td>
      </tr>
       <th>[% 'Show only marked as paid invoices' | $T8 %]</th>
       <td>[% L.checkbox_tag('show_marked_as_closed') %]</td>
      </tr>

+    [% IF INSTANCE_CONF.get_email_journal %]
+     <tr>
+      <th>[% 'Show only not mailed invoices' | $T8 %]</th>
+      <td>[% L.checkbox_tag('show_not_mailed') %]</td>
+     </tr>
+    [% END %]

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