From 64089bbee912e14de46e9156fa9bf1c2d7e51659 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20B=C3=BCren?= Date: Tue, 29 Jan 2019 07:20:28 +0100 Subject: [PATCH] Verkauf->Rechnungsbericht Filter nach nicht per E-Mail verschickten Belegen --- SL/AR.pm | 12 ++++++++++++ bin/mozilla/ar.pl | 2 +- locale/de/all | 1 + templates/webpages/ar/search.html | 6 ++++++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/SL/AR.pm b/SL/AR.pm index e227eb6e1..0c8f842b3 100644 --- a/SL/AR.pm +++ b/SL/AR.pm @@ -620,6 +620,18 @@ SQL push @values, like($form->{parts_description}); } + if ($form->{show_not_mailed}) { + $where .= <{show_marked_as_closed}) { $query .= ' LEFT JOIN ( diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl index 0ea557d27..3706598fb 100644 --- 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 - 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); diff --git a/locale/de/all b/locale/de/all index 9bfd60f9c..1020aa5c1 100755 --- 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 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', diff --git a/templates/webpages/ar/search.html b/templates/webpages/ar/search.html index c32800377..2000b8ca4 100644 --- a/templates/webpages/ar/search.html +++ b/templates/webpages/ar/search.html @@ -68,6 +68,12 @@ [% 'Show only marked as paid invoices' | $T8 %] [% L.checkbox_tag('show_marked_as_closed') %] + [% IF INSTANCE_CONF.get_email_journal %] + + [% 'Show only not mailed invoices' | $T8 %] + [% L.checkbox_tag('show_not_mailed') %] + + [% END %] [% 'Invoice Date' | $T8 %] -- 2.20.1