X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FCommon.pm;h=2027a26763b3e8b56eddf33c98d39cdabf83e165;hb=65b054be8038e3eeb3dd2c87ba52a82a843cfd4f;hp=b977c00592717f5b24c171cec7512328ac8d63f9;hpb=9ebaa094105fc893633f2dca829424d33500f90c;p=kivitendo-erp.git diff --git a/SL/Common.pm b/SL/Common.pm index b977c0059..2027a2676 100644 --- a/SL/Common.pm +++ b/SL/Common.pm @@ -62,7 +62,7 @@ sub retrieve_parts { next unless $form->{$_}; $filter .= qq| AND ($_ ILIKE ?)|; - push @filter_values, '%' . $form->{$_} . '%'; + push @filter_values, like($form->{$_}); } if ($form->{no_assemblies}) { @@ -110,7 +110,7 @@ sub retrieve_customers_or_vendors { my (@filter_values, $filter); if ($form->{"name"}) { $filter .= " AND (TABLE.name ILIKE ?)"; - push(@filter_values, '%' . $form->{"name"} . '%'); + push(@filter_values, like($form->{"name"})); } if (!$form->{"obsolete"}) { $filter .= " AND NOT TABLE.obsolete"; @@ -173,7 +173,7 @@ sub retrieve_delivery_customer { my (@filter_values, $filter); if ($form->{"name"}) { $filter .= qq| (name ILIKE ?) AND|; - push(@filter_values, '%' . $form->{"name"} . '%'); + push(@filter_values, like($form->{"name"})); } $order_by =~ s/[^a-zA-Z_]//g; @@ -209,7 +209,7 @@ sub retrieve_vendor { my (@filter_values, $filter); if ($form->{"name"}) { $filter .= qq| (name ILIKE ?) AND|; - push(@filter_values, '%' . $form->{"name"} . '%'); + push(@filter_values, like($form->{"name"})); } $order_by =~ s/[^a-zA-Z_]//g; @@ -350,7 +350,7 @@ sub get_vc_details { $form->{CONTACTS} = selectall_hashref_query($form, $dbh, $query, $vc_id); # Only show default pricegroup for customer, not vendor, which is why this is outside the main query - ($form->{pricegroup}) = selectrow_query($form, $dbh, qq|SELECT pricegroup FROM pricegroup WHERE id = ?|, $form->{klass}); + ($form->{pricegroup}) = selectrow_query($form, $dbh, qq|SELECT pricegroup FROM pricegroup WHERE id = ?|, $form->{pricegroup_id}); $dbh->disconnect();