(I)LIKE-Argumente immer mit Funktion SL::DBUtils::like erstellen

[mfinanz.git] / SL / DO.pm

diff --git a/SL/DO.pm b/SL/DO.pm
index a1bfd0017e800628c70aa39e685776a4b18c366b..ee62af2235ba570226f7151cfa1cb95c7b4a2a1c 100644 (file)
--- a/SL/DO.pm
+++ b/SL/DO.pm
@@ -111,12 +111,12 @@ sub transactions {
 
   } elsif ($form->{$vc}) {
     push @where,  qq|ct.name ILIKE ?|;
 
   } elsif ($form->{$vc}) {
     push @where,  qq|ct.name ILIKE ?|;

-    push @values, '%' . trim($form->{$vc}) . '%';
+    push @values, like($form->{$vc});

   }
 
   if ($form->{"cp_name"}) {
     push @where, "(cp.cp_name ILIKE ? OR cp.cp_givenname ILIKE ?)";
   }
 
   if ($form->{"cp_name"}) {
     push @where, "(cp.cp_name ILIKE ? OR cp.cp_givenname ILIKE ?)";

-    push @values, ('%' . trim($form->{"cp_name"}) . '%')x2;
+    push @values, (like($form->{"cp_name"}))x2;

   }
 
   foreach my $item (qw(employee_id salesman_id)) {
   }
 
   foreach my $item (qw(employee_id salesman_id)) {


@@ -132,7 +132,7 @@ sub transactions {
   foreach my $item (qw(donumber ordnumber cusordnumber transaction_description)) {
     next unless ($form->{$item});
     push @where,  qq|dord.$item ILIKE ?|;
   foreach my $item (qw(donumber ordnumber cusordnumber transaction_description)) {
     next unless ($form->{$item});
     push @where,  qq|dord.$item ILIKE ?|;

-    push @values, '%' . trim($form->{$item}) . '%';
+    push @values, like($form->{$item});

   }
 
   if (($form->{open} || $form->{closed}) &&
   }
 
   if (($form->{open} || $form->{closed}) &&


@@ -147,7 +147,7 @@ sub transactions {
 
   if ($form->{serialnumber}) {
     push @where, 'dord.id IN (SELECT doi.delivery_order_id FROM delivery_order_items doi WHERE doi.serialnumber LIKE ?)';
 
   if ($form->{serialnumber}) {
     push @where, 'dord.id IN (SELECT doi.delivery_order_id FROM delivery_order_items doi WHERE doi.serialnumber LIKE ?)';

-    push @values, '%' . trim($form->{serialnumber}) . '%';
+    push @values, like($form->{serialnumber});

   }
 
   if($form->{transdatefrom}) {
   }
 
   if($form->{transdatefrom}) {