westermm hat völlig zu Recht auf die Änderungen in Revision 3512 hingewiesen. Das...

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

diff --git a/SL/CT.pm b/SL/CT.pm
index 31ba176..b1c21ab 100644 (file)
--- a/SL/CT.pm
+++ b/SL/CT.pm
@@ -155,8 +155,9 @@ sub populate_drop_down_boxes {
 
   # get shipto address
   $query =
-    qq|SELECT shipto_id, shiptoname, shiptodepartment_1 | .
-    qq|FROM shipto WHERE (trans_id = ?) AND (module = 'CT')|;
+    qq|SELECT shipto_id, shiptoname, shiptodepartment_1, shiptostreet, shiptocity
+       FROM shipto
+       WHERE (trans_id = ?) AND (module = 'CT')|;
   $form->{SHIPTO} = selectall_hashref_query($form, $dbh, $query, $form->{id});
 
   # get contacts
@@ -301,12 +302,12 @@ sub save_customer {
     qq|terms = ?, | .
     qq|business_id = ?, | .
     qq|taxnumber = ?, | .
-    qq|sic_code = ?, | .
     qq|language = ?, | .
     qq|account_number = ?, | .
     qq|bank_code = ?, | .
     qq|bank = ?, | .
     qq|obsolete = ?, | .
+    qq|direct_debit = ?, | .
     qq|ustid = ?, | .
     qq|username = ?, | .
     qq|salesman_id = ?, | .
@@ -340,12 +341,12 @@ sub save_customer {
     conv_i($form->{terms}),
     conv_i($form->{business}),
     $form->{taxnumber},
-    $form->{sic},
     $form->{language},
     $form->{account_number},
     $form->{bank_code},
     $form->{bank},
     $form->{obsolete} ? 't' : 'f',
+    $form->{direct_debit} ? 't' : 'f',
     $form->{ustid},
     $form->{username},
     conv_i($form->{salesman_id}),
@@ -506,12 +507,12 @@ sub save_vendor {
     qq|  creditlimit = ?, | .
     qq|  business_id = ?, | .
     qq|  taxnumber = ?, | .
-    qq|  sic_code = ?, | .
     qq|  language = ?, | .
     qq|  account_number = ?, | .
     qq|  bank_code = ?, | .
     qq|  bank = ?, | .
     qq|  obsolete = ?, | .
+    qq|  direct_debit = ?, | .
     qq|  ustid = ?, | .
     qq|  payment_id = ?, | .
     qq|  taxzone_id = ?, | .
@@ -543,12 +544,12 @@ sub save_vendor {
     $form->{creditlimit},
     conv_i($form->{business}),
     $form->{taxnumber},
-    $form->{sic},
     $form->{language},
     $form->{account_number},
     $form->{bank_code},
     $form->{bank},
     $form->{obsolete} ? 't' : 'f',
+    $form->{direct_debit} ? 't' : 'f',
     $form->{ustid},
     conv_i($form->{payment_id}),
     conv_i($form->{taxzone_id}, 0),
@@ -680,16 +681,14 @@ sub search {
   my @values;
 
   my %allowed_sort_columns =
-    map({ $_, 1 } qw(id customernumber vendornumber name address contact phone fax email
-                     taxnumber sic_code business invnumber ordnumber quonumber));
+    map({ $_, 1 } qw(id customernumber vendornumber name contact phone fax email
+                     taxnumber business invnumber ordnumber quonumber));
   $sortorder    = $form->{sort} && $allowed_sort_columns{$form->{sort}} ? $form->{sort} : "name";
   $form->{sort} = $sortorder;
   my $sortdir   = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
 
-  if ($sortorder eq "address") {
-    $sortorder = "lower(country) ${sortdir}, lower(city) ${sortdir}, lower(street) ${sortdir}";
-  } elsif ($sortorder ne 'id') {
-    $sortorder = "lower($sortorder) ${sortdir}";
+if ($sortorder ne 'id') {
+    $sortorder  = "lower($sortorder) ${sortdir}";
   } else {
     $sortorder .= " ${sortdir}";
   }
@@ -706,6 +705,24 @@ sub search {
     }
   }
 
+  if ($form->{cp_name}) {
+    $where .= " AND ct.id IN (SELECT cp_cv_id FROM contacts WHERE lower(cp_name) LIKE lower(?))";
+    push @values, '%' . $form->{cp_name} . '%';
+  }
+
+  if ($form->{addr_city}) {
+    $where .= " AND ((lower(ct.city) LIKE lower(?))
+                     OR
+                     (ct.id IN (
+                        SELECT trans_id
+                        FROM shipto
+                        WHERE (module = 'CT')
+                          AND (lower(shiptocity) LIKE lower(?))
+                      ))
+                     )";
+    push @values, ('%' . $form->{addr_city} . '%') x 2;
+  }
+
   if ( $form->{status} eq 'orphaned' ) {
     $where .=
       qq| AND ct.id NOT IN | .
@@ -744,7 +761,17 @@ sub search {
     $where .= qq| AND ($cvar_where)|;
     push @values, @cvar_values;
   }
-
+  # Um nach Straße  in der Berichtsmaske zu suchen ... jb 13.11.2008               
+    if ($form->{addr_street}) {                                                
+      $where .= qq| AND (street ILIKE ?)|;                               
+      push @values, ('%' . $form->{addr_street} . '%');                     
+    }                                                        
+                                                                
+  # Um nach PLZ  in der Berichtsmaske zu suchen ... jb 13.11.2008
+    if ($form->{addr_zipcode}) {                                    
+      $where .= qq| AND (zipcode ILIKE ?)|;                            
+      push @values, ($form->{addr_zipcode} . '%');                      
+    }   
   my $query =
     qq|SELECT ct.*, b.description AS business | .
     qq|FROM $cv ct | .
@@ -810,8 +837,6 @@ sub search {
   $query .= qq| ORDER BY $sortorder|;
 
   $form->{CT} = selectall_hashref_query($form, $dbh, $query, @values);
-  map({ my $ref = $_; $ref->{address} = join(" ", map({ $ref->{$_} } qw(street zipcode city country))); }
-      @{ $form->{CT} });
 
   $main::lxdebug->leave_sub();
 }