From cf9865dc7faad6b1ea68e2c5db8b8b44d316fd26 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Fri, 20 Jan 2017 15:03:22 +0100 Subject: [PATCH] Einkaufsrechnungssuche: keine Multibox mehr nutzen --- SL/AP.pm | 5 +---- bin/mozilla/ap.pl | 12 ++++-------- templates/webpages/ap/search.html | 32 +++---------------------------- 3 files changed, 8 insertions(+), 41 deletions(-) diff --git a/SL/AP.pm b/SL/AP.pm index 41452511a..8d700640e 100644 --- a/SL/AP.pm +++ b/SL/AP.pm @@ -439,10 +439,7 @@ sub ap_transactions { my @values; - if ($form->{vendor_id}) { - $where .= " AND a.vendor_id = ?"; - push(@values, $form->{vendor_id}); - } elsif ($form->{vendor}) { + if ($form->{vendor}) { $where .= " AND v.name ILIKE ?"; push(@values, like($form->{vendor})); } diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl index 5f4611550..5aa3713a2 100644 --- a/bin/mozilla/ap.pl +++ b/bin/mozilla/ap.pl @@ -816,18 +816,16 @@ sub search { my %myconfig = %main::myconfig; my $locale = $main::locale; - # setup customer selection - $form->all_vc(\%myconfig, "vendor", "AP"); - $form->{title} = $locale->text('AP Transactions'); - $form->get_lists("projects" => { "key" => "ALL_PROJECTS", "all" => 1 }, - "vendors" => "ALL_VC"); + $form->get_lists(projects => { "key" => "ALL_PROJECTS", "all" => 1 }); - $::form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all; + $::form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all_sorted; # constants and subs for template $form->{vc_keys} = sub { "$_[0]->{name}--$_[0]->{id}" }; + $::request->layout->add_javascripts("autocomplete_project.js"); + $form->header; print $form->parse_html_template('ap/search', { %myconfig }); @@ -864,8 +862,6 @@ sub ap_transactions { $main::auth->assert('vendor_invoice_edit'); - ($form->{vendor}, $form->{vendor_id}) = split(/--/, $form->{vendor}); - report_generator_set_default_sort('transdate', 1); AP->ap_transactions(\%myconfig, \%$form); diff --git a/templates/webpages/ap/search.html b/templates/webpages/ap/search.html index 67d2b8260..3c33e2a32 100644 --- a/templates/webpages/ap/search.html +++ b/templates/webpages/ap/search.html @@ -1,5 +1,5 @@ [%- USE T8 %] -[%- USE L %] +[%- USE L %][%- USE P -%]

[% title %]

@@ -10,22 +10,7 @@ - + @@ -51,18 +36,7 @@ - + -- 2.20.1
[% 'Vendor' | $T8 %] - [%- INCLUDE 'generic/multibox.html' - id = 'vendor', - name = 'vendor', - default = oldvendor, - style = 'width: 250px', - class = 'initial_focus', - DATA = ALL_VC, - id_sub = 'vc_keys', - label_key = 'name', - select = vc_select, - limit = vclimit, - show_empty = 1, - allow_textbox = 1, - -%] - [% L.input_tag("vendor", vendor, style="width: 250px", class="initial_focus") %]
[% 'Contact Person' | $T8 %]
[% 'Project Number' | $T8 %] - [%- INCLUDE 'generic/multibox.html' - name = 'project_id', - style = "width: 250px", - DATA = ALL_PROJECTS, - id_key = 'id', - label_key = 'projectnumber', - limit = vclimit, - show_empty = 1, - allow_textbox = 0, - -%] - [% P.project_picker("project_id", project_id, style="width: 250px") %] [% 'Part Number' | $T8 %]