Einkaufsrechnungssuche: keine Multibox mehr nutzen

diff --git a/SL/AP.pm b/SL/AP.pm
index 41452511aeb541d629a3b46154928f0d913a10f3..8d700640e532b86b80506c23286ff1af7c1e1383 100644 (file)
--- a/SL/AP.pm
+++ b/SL/AP.pm
@@ -439,10 +439,7 @@ sub ap_transactions {
 
   my @values;
 
 
   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}));
   }
     $where .= " AND v.name ILIKE ?";
     push(@values, like($form->{vendor}));
   }

diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index 5f461155074681f2994cc26e22c757d096c46fba..5aa3713a208233633accfdf9edf4a2bd92c0a225 100644 (file)
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -816,18 +816,16 @@ sub search {
   my %myconfig = %main::myconfig;
   my $locale   = $main::locale;
 
   my %myconfig = %main::myconfig;
   my $locale   = $main::locale;
 

-  # setup customer selection
-  $form->all_vc(\%myconfig, "vendor", "AP");
-

   $form->{title}    = $locale->text('AP Transactions');
 
   $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}" };
 
   # 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 });
 
   $form->header;
   print $form->parse_html_template('ap/search', { %myconfig });
 


@@ -864,8 +862,6 @@ sub ap_transactions {
 
   $main::auth->assert('vendor_invoice_edit');
 
 
   $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);
   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 67d2b826024fa581e0e2b5566fc8014e9efe09c6..3c33e2a3265a9132450fb1d7f04a9c5bf1ad1362 100644 (file)
--- a/templates/webpages/ap/search.html
+++ b/templates/webpages/ap/search.html
@@ -1,5 +1,5 @@
 [%- USE T8 %]
 [%- USE T8 %]

-[%- USE L %]
+[%- USE L %][%- USE P -%]

 <h1>[% title %]</h1>
 
  <form method=post name="search" action=[% script %]>
 <h1>[% title %]</h1>
 
  <form method=post name="search" action=[% script %]>


@@ -10,22 +10,7 @@
     <table>
      <tr>
       <th align=right>[% 'Vendor' | $T8 %]</th>
     <table>
      <tr>
       <th align=right>[% 'Vendor' | $T8 %]</th>

-      <td colspan=3>
-            [%- 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,
-                 -%]
-      </td>
+      <td colspan=3>[% L.input_tag("vendor", vendor, style="width: 250px", class="initial_focus") %]</td>

      </tr>
     <tr>
      <th align="right" nowrap>[% 'Contact Person' | $T8 %]</th>
      </tr>
     <tr>
      <th align="right" nowrap>[% 'Contact Person' | $T8 %]</th>


@@ -51,18 +36,7 @@
      </tr>
      <tr>
       <th align="right">[% 'Project Number' | $T8 %]</th>
      </tr>
      <tr>
       <th align="right">[% 'Project Number' | $T8 %]</th>

-      <td>
-            [%- 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,
-            -%]
-      </td>
+      <td colspan="3">[% P.project_picker("project_id", project_id, style="width: 250px") %]</td>

       <th align="right">[% 'Part Number' | $T8 %]</th>
       <td><input name="parts_partnumber" size="20"></td>
      </tr>
       <th align="right">[% 'Part Number' | $T8 %]</th>
       <td><input name="parts_partnumber" size="20"></td>
      </tr>