print_form: Extension war vor -r3314 standard auf "html", wurde dann durch anderen...

[kivitendo-erp.git] / bin / mozilla / am.pl

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index fafe656..a99204c 100644 (file)
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -2818,6 +2818,9 @@ sub show_am_history {
 
   $auth->assert('config');
 
+  my $callback     = build_std_url(qw(action einschraenkungen fromdate todate mitarbeiter searchid what2search));
+  $form->{order} ||= 'h.itime--1';
+
   my %search = ( "Artikelnummer"          => "parts",
                  "Kundennummer"           => "customer",
                  "Lieferantennummer"      => "vendor",
@@ -2842,8 +2845,11 @@ sub show_am_history {
   my $restriction  = qq| AND (| . join(' OR ', map { " addition = " . $dbh->quote($_) } split(m/\,/, $form->{einschraenkungen})) . qq|)| if $form->{einschraenkungen};
   $restriction    .= qq| AND h.itime::date >= | . conv_dateq($form->{fromdate})                                                          if $form->{fromdate};
   $restriction    .= qq| AND h.itime::date <= | . conv_dateq($form->{todate})                                                            if $form->{todate};
-  $restriction    .= qq| AND employee_id = |    . $form->{mitarbeiter}                                                                   if $form->{mitarbeiter} =~ m/^\d+$/;
-  $restriction    .= qq| AND employee_id = |    . get_employee_id($form->{mitarbeiter}, $dbh)                                            if $form->{mitarbeiter};
+  if ($form->{mitarbeiter} =~ m/^\d+$/) {
+    $restriction  .= qq| AND employee_id = |    . $form->{mitarbeiter};
+  } elsif ($form->{mitarbeiter}) {
+    $restriction  .= qq| AND employee_id = (SELECT id FROM employee WHERE name ILIKE | . $dbh->quote('%' . $form->{mitarbeiter} . '%') . qq|)|;
+  }
 
   my $query = qq|SELECT trans_id AS id FROM history_erp | .
     (  $form->{'searchid'} ? qq| WHERE snumbers = '|  . $searchNo{$form->{'what2search'}} . qq|_| . $form->{'searchid'} . qq|'|
@@ -2864,27 +2870,14 @@ sub show_am_history {
                                      "SUCCESS"        => ($form->get_history($dbh, $daten, $restriction, $form->{order}) ne "0"),
                                      "NONEWWINDOW"    => 1,
                                      uc($sort)        => 1,
-                                     uc($sort) . "BY" => $sortby
+                                     uc($sort) . "BY" => $sortby,
+                                     'callback'       => $callback,
                                    });
   $dbh->disconnect();
 
   $lxdebug->leave_sub();
 }
 
-sub get_employee_id {
-       $lxdebug->enter_sub();
-
-  $auth->assert('config');
-
-       my $query = qq|SELECT id FROM employee WHERE name = '| . $_[0] . qq|'|;
-       my $sth = $_[1]->prepare($query);
-       $sth->execute() || $form->dberror($query);
-       my $return = $sth->fetch();
-       $sth->finish();
-       return ${$return}[0];
-       $lxdebug->leave_sub();
-}
-
 sub swap_units {
   $lxdebug->enter_sub();