Gelieferte Mengen über Recordlinks ermitteln(2)

[kivitendo-erp.git] / SL / AP.pm

diff --git a/SL/AP.pm b/SL/AP.pm
index 7db5649..9e108a1 100644 (file)
--- a/SL/AP.pm
+++ b/SL/AP.pm
@@ -39,6 +39,7 @@ use SL::DBUtils;
 use SL::IO;
 use SL::MoreCommon;
 use SL::DB::Default;
+use SL::Util qw(trim);
 use Data::Dumper;
 
 use strict;
@@ -453,11 +454,11 @@ sub ap_transactions {
     push(@values, $form->{vendor_id});
   } elsif ($form->{vendor}) {
     $where .= " AND v.name ILIKE ?";
-    push(@values, $form->like($form->{vendor}));
+    push(@values, like($form->{vendor}));
   }
   if ($form->{"cp_name"}) {
     $where .= " AND (cp.cp_name ILIKE ? OR cp.cp_givenname ILIKE ?)";
-    push(@values, ('%' . $form->{"cp_name"} . '%')x2);
+    push(@values, (like($form->{"cp_name"}))x2);
   }
   if ($form->{department}) {
     # ähnlich wie commit 0bbfb33b6aa8e38bb6c81d1684ab7d08e5b5c5af abteilung
@@ -469,15 +470,15 @@ sub ap_transactions {
   }
   if ($form->{invnumber}) {
     $where .= " AND a.invnumber ILIKE ?";
-    push(@values, $form->like($form->{invnumber}));
+    push(@values, like($form->{invnumber}));
   }
   if ($form->{ordnumber}) {
     $where .= " AND a.ordnumber ILIKE ?";
-    push(@values, $form->like($form->{ordnumber}));
+    push(@values, like($form->{ordnumber}));
   }
   if ($form->{notes}) {
     $where .= " AND lower(a.notes) LIKE ?";
-    push(@values, $form->like($form->{notes}));
+    push(@values, like($form->{notes}));
   }
   if ($form->{project_id}) {
     $where .=
@@ -493,11 +494,11 @@ sub ap_transactions {
 
   if ($form->{transdatefrom}) {
     $where .= " AND a.transdate >= ?";
-    push(@values, $form->{transdatefrom});
+    push(@values, trim($form->{transdatefrom}));
   }
   if ($form->{transdateto}) {
     $where .= " AND a.transdate <= ?";
-    push(@values, $form->{transdateto});
+    push(@values, trim($form->{transdateto}));
   }
   if ($form->{open} || $form->{closed}) {
     unless ($form->{open} && $form->{closed}) {
@@ -832,8 +833,6 @@ sub storno {
 
   map { IO->set_datepaid(table => 'ap', id => $_, dbh => $dbh) } ($id, $new_id);
 
-  $form->new_lastmtime('ap') if $storno_id == $form->{id};
-
   $dbh->commit;
 
   $main::lxdebug->leave_sub();