From: Jan Büren Date: Fri, 28 Jan 2022 10:48:08 +0000 (+0100) Subject: Rechnungssuche: Filter für Ship via und Shipping Point X-Git-Tag: kivitendo-mebil_0.1-0~10^2~2^2~227 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=7d2ab55b52135d5b4b58f3b081830c4efce3678b;p=kivitendo-erp.git Rechnungssuche: Filter für Ship via und Shipping Point --- diff --git a/SL/AR.pm b/SL/AR.pm index b856f44a7..280184d7e 100644 --- a/SL/AR.pm +++ b/SL/AR.pm @@ -575,7 +575,7 @@ sub ar_transactions { $where .= " AND a.department_id = ?"; push(@values, $form->{department_id}); } - foreach my $column (qw(invnumber ordnumber cusordnumber notes transaction_description)) { + foreach my $column (qw(invnumber ordnumber cusordnumber notes transaction_description shipvia shippingpoint)) { if ($form->{$column}) { $where .= " AND a.$column ILIKE ?"; push(@values, like($form->{$column})); diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl index 71f94cce8..b2a6602bb 100644 --- a/bin/mozilla/ar.pl +++ b/bin/mozilla/ar.pl @@ -1036,7 +1036,8 @@ 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 show_not_mailed); + employee_id salesman_id business_id parts_partnumber parts_description department_id show_marked_as_closed show_not_mailed + shippingpoint shipvia); push @hidden_variables, map { "cvar_$_->{name}" } @ct_searchable_custom_variables; $href = $params{want_binary_pdf} ? '' : build_std_url('action=ar_transactions', grep { $form->{$_} } @hidden_variables); @@ -1159,6 +1160,13 @@ sub ar_transactions { if ($form->{closed}) { push @options, $locale->text('Closed'); } + if ($form->{shipvia}) { + push @options, $locale->text('Ship via') . " : $form->{shipvia}"; + } + if ($form->{shippingpoint}) { + push @options, $locale->text('Shipping Point') . " : $form->{shippingpoint}"; + } + $form->{ALL_PRINTERS} = SL::DB::Manager::Printer->get_all_sorted; diff --git a/templates/webpages/ar/search.html b/templates/webpages/ar/search.html index 4f03f6a1e..66049642e 100644 --- a/templates/webpages/ar/search.html +++ b/templates/webpages/ar/search.html @@ -54,6 +54,12 @@ [% 'Part Number' | $T8 %] [% L.input_tag("parts_partnumber", "", style=style) %] + + [% 'Shipping Point' | $T8 %] + [% L.input_tag("shippingpoint", "", style=style) %] + [% 'Ship via' | $T8 %] + [% L.input_tag("shipvia", "", style=style) %] + [% 'Project Number' | $T8 %] [% P.project.picker("project_id", project_id, active="both", valid="both", style=style) %]