Brieffunktion: Werte in Entwurfsliste richtig formatieren

[mfinanz.git] / SL / AR.pm

diff --git a/SL/AR.pm b/SL/AR.pm
index 405a7f2fca050b6525921f5c110af0f888a652f4..d37b7fc755d5f0f44f401927a5281a22183c2510 100644 (file)
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -41,6 +41,7 @@ use SL::IO;
 use SL::MoreCommon;
 use SL::DB::Default;
 use SL::TransNumber;
 use SL::MoreCommon;
 use SL::DB::Default;
 use SL::TransNumber;

+use SL::Util qw(trim);

 
 use strict;
 
 
 use strict;
 


@@ -499,18 +500,18 @@ sub ar_transactions {
 
   if ($form->{customernumber}) {
     $where .= " AND c.customernumber = ?";
 
   if ($form->{customernumber}) {
     $where .= " AND c.customernumber = ?";

-    push(@values, $form->{customernumber});
+    push(@values, trim($form->{customernumber}));

   }
   if ($form->{customer_id}) {
     $where .= " AND a.customer_id = ?";
     push(@values, $form->{customer_id});
   } elsif ($form->{customer}) {
     $where .= " AND c.name ILIKE ?";
   }
   if ($form->{customer_id}) {
     $where .= " AND a.customer_id = ?";
     push(@values, $form->{customer_id});
   } elsif ($form->{customer}) {
     $where .= " AND c.name ILIKE ?";

-    push(@values, $form->like($form->{customer}));
+    push(@values, like($form->{customer}));

   }
   if ($form->{"cp_name"}) {
     $where .= " AND (cp.cp_name ILIKE ? OR cp.cp_givenname ILIKE ?)";
   }
   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->{business_id}) {
     my $business_id = $form->{business_id};
   }
   if ($form->{business_id}) {
     my $business_id = $form->{business_id};


@@ -523,14 +524,14 @@ sub ar_transactions {
     push(@values, $department_id);
   }
   if ($form->{department}) {
     push(@values, $department_id);
   }
   if ($form->{department}) {

-    my $department = "%" . $form->{department} . "%";
+    my $department = like($form->{department});

     $where .= " AND d.description ILIKE ?";
     push(@values, $department);
   }
   foreach my $column (qw(invnumber ordnumber cusordnumber notes transaction_description)) {
     if ($form->{$column}) {
       $where .= " AND a.$column ILIKE ?";
     $where .= " AND d.description ILIKE ?";
     push(@values, $department);
   }
   foreach my $column (qw(invnumber ordnumber cusordnumber notes transaction_description)) {
     if ($form->{$column}) {
       $where .= " AND a.$column ILIKE ?";

-      push(@values, $form->like($form->{$column}));
+      push(@values, like($form->{$column}));

     }
   }
   if ($form->{"project_id"}) {
     }
   }
   if ($form->{"project_id"}) {


@@ -547,19 +548,19 @@ sub ar_transactions {
 
   if ($form->{transdatefrom}) {
     $where .= " AND a.transdate >= ?";
 
   if ($form->{transdatefrom}) {
     $where .= " AND a.transdate >= ?";

-    push(@values, $form->{transdatefrom});
+    push(@values, trim($form->{transdatefrom}));

   }
   if ($form->{transdateto}) {
     $where .= " AND a.transdate <= ?";
   }
   if ($form->{transdateto}) {
     $where .= " AND a.transdate <= ?";

-    push(@values, $form->{transdateto});
+    push(@values, trim($form->{transdateto}));

   }
   if ($form->{duedatefrom}) {
     $where .= " AND a.duedate >= ?";
   }
   if ($form->{duedatefrom}) {
     $where .= " AND a.duedate >= ?";

-    push(@values, $form->{duedatefrom});
+    push(@values, trim($form->{duedatefrom}));

   }
   if ($form->{duedateto}) {
     $where .= " AND a.duedate <= ?";
   }
   if ($form->{duedateto}) {
     $where .= " AND a.duedate <= ?";

-    push(@values, $form->{duedateto});
+    push(@values, trim($form->{duedateto}));

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