mit der Umleitung nach dev/null wird nicht ausgedruckt

[mfinanz.git] / SL / CT.pm

diff --git a/SL/CT.pm b/SL/CT.pm
index 933ec15c9ccadfe521d9178ed72a1f4930823680..3df827a6d0f365c3e77dfe875a0dc20717ef4c4d 100644 (file)
--- a/SL/CT.pm
+++ b/SL/CT.pm
@@ -302,7 +302,6 @@ sub save_customer {
     qq|terms = ?, | .
     qq|business_id = ?, | .
     qq|taxnumber = ?, | .
     qq|terms = ?, | .
     qq|business_id = ?, | .
     qq|taxnumber = ?, | .

-    qq|sic_code = ?, | .

     qq|language = ?, | .
     qq|account_number = ?, | .
     qq|bank_code = ?, | .
     qq|language = ?, | .
     qq|account_number = ?, | .
     qq|bank_code = ?, | .


@@ -342,7 +341,6 @@ sub save_customer {
     conv_i($form->{terms}),
     conv_i($form->{business}),
     $form->{taxnumber},
     conv_i($form->{terms}),
     conv_i($form->{business}),
     $form->{taxnumber},

-    $form->{sic},

     $form->{language},
     $form->{account_number},
     $form->{bank_code},
     $form->{language},
     $form->{account_number},
     $form->{bank_code},


@@ -509,7 +507,6 @@ sub save_vendor {
     qq|  creditlimit = ?, | .
     qq|  business_id = ?, | .
     qq|  taxnumber = ?, | .
     qq|  creditlimit = ?, | .
     qq|  business_id = ?, | .
     qq|  taxnumber = ?, | .

-    qq|  sic_code = ?, | .

     qq|  language = ?, | .
     qq|  account_number = ?, | .
     qq|  bank_code = ?, | .
     qq|  language = ?, | .
     qq|  account_number = ?, | .
     qq|  bank_code = ?, | .


@@ -547,7 +544,6 @@ sub save_vendor {
     $form->{creditlimit},
     conv_i($form->{business}),
     $form->{taxnumber},
     $form->{creditlimit},
     conv_i($form->{business}),
     $form->{taxnumber},

-    $form->{sic},

     $form->{language},
     $form->{account_number},
     $form->{bank_code},
     $form->{language},
     $form->{account_number},
     $form->{bank_code},


@@ -685,15 +681,13 @@ sub search {
   my @values;
 
   my %allowed_sort_columns =
   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';
 
   $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') {
+if ($sortorder ne 'id') {

     $sortorder  = "lower($sortorder) ${sortdir}";
   } else {
     $sortorder .= " ${sortdir}";
     $sortorder  = "lower($sortorder) ${sortdir}";
   } else {
     $sortorder .= " ${sortdir}";


@@ -711,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 | .
   if ( $form->{status} eq 'orphaned' ) {
     $where .=
       qq| AND ct.id NOT IN | .


@@ -750,6 +762,16 @@ sub search {
     push @values, @cvar_values;
   }
 
     push @values, @cvar_values;
   }
 

+  if ($form->{addr_street}) {
+    $where .= qq| AND (street ILIKE ?)|;
+    push @values, '%' . $form->{addr_street} . '%';
+  }
+
+  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 | .
   my $query =
     qq|SELECT ct.*, b.description AS business | .
     qq|FROM $cv ct | .


@@ -815,8 +837,6 @@ sub search {
   $query .= qq| ORDER BY $sortorder|;
 
   $form->{CT} = selectall_hashref_query($form, $dbh, $query, @values);
   $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();
 }
 
   $main::lxdebug->leave_sub();
 }


@@ -903,8 +923,9 @@ sub get_delivery {
   }
   my $query =
     qq|SELECT s.shiptoname, i.qty, | .
   }
   my $query =
     qq|SELECT s.shiptoname, i.qty, | .

-    qq|  ${arap}.transdate, ${arap}.invnumber, ${arap}.ordnumber, | .
-    qq|  i.description, i.unit, i.sellprice | .
+    qq|  ${arap}.id, ${arap}.transdate, ${arap}.invnumber, ${arap}.ordnumber, | .
+    qq|  i.description, i.unit, i.sellprice, | .
+    qq|  oe.id AS oe_id | .

     qq|FROM $arap | .
     qq|LEFT JOIN shipto s ON | .
     ($arap eq "ar"
     qq|FROM $arap | .
     qq|LEFT JOIN shipto s ON | .
     ($arap eq "ar"


@@ -912,6 +933,7 @@ sub get_delivery {
      : qq|(ap.id = s.trans_id) |) .
     qq|LEFT JOIN invoice i ON (${arap}.id = i.trans_id) | .
     qq|LEFT join parts p ON (p.id = i.parts_id) | .
      : qq|(ap.id = s.trans_id) |) .
     qq|LEFT JOIN invoice i ON (${arap}.id = i.trans_id) | .
     qq|LEFT join parts p ON (p.id = i.parts_id) | .

+    qq|LEFT JOIN oe ON (oe.ordnumber = ${arap}.ordnumber AND NOT ${arap}.ordnumber = '') | .

     $where .
     qq|ORDER BY ${arap}.transdate DESC LIMIT 15|;
 
     $where .
     qq|ORDER BY ${arap}.transdate DESC LIMIT 15|;