X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FCT.pm;h=a661e8c58a59174bffcb51206b8ff0e572638dc4;hb=5c3437e5b742d646d573f3c52fb68de010e7cdd0;hp=7e81d66c419a44f6419d241664387dc291a1a8b0;hpb=4f19857efd5a26253699b24a305176fda21b010a;p=kivitendo-erp.git

diff --git a/SL/CT.pm b/SL/CT.pm
index 7e81d66c4..a661e8c58 100644
--- a/SL/CT.pm
+++ b/SL/CT.pm
@@ -45,6 +45,8 @@ use SL::DBUtils;
 use SL::FU;
 use SL::Notes;
 
+use strict;
+
 sub get_tuple {
   $main::lxdebug->enter_sub();
 
@@ -62,7 +64,7 @@ sub get_tuple {
     qq|ORDER BY cp.cp_id LIMIT 1|;
   my $sth = prepare_execute_query($form, $dbh, $query, $form->{id});
 
-  my $ref = $sth->fetchrow_hashref(NAME_lc);
+  my $ref = $sth->fetchrow_hashref("NAME_lc");
 
   map { $form->{$_} = $ref->{$_} } keys %$ref;
 
@@ -116,14 +118,21 @@ sub get_tuple {
     if ($ref) {
       foreach my $key (keys %{ $ref }) {
         my $new_key       =  $key;
-        $new_key          =~ s/^([^_]+)/\U\1\E/;
+        $new_key          =~ s/^([^_]+)/\U$1\E/;
         $form->{$new_key} =  $ref->{$key};
       }
     }
   }
 
   # check if it is orphaned
-  my $arap = ( $form->{db} eq 'customer' ) ? "ar" : "ap";
+  my $arap      = ( $form->{db} eq 'customer' ) ? "ar" : "ap";
+  my $num_args  = 2;
+  my $makemodel = '';
+  if ($form->{db} eq 'vendor') {
+    $makemodel = qq| UNION SELECT 1 FROM makemodel mm WHERE mm.make = ?|;
+    $num_args++;
+  }
+
   $query =
     qq|SELECT a.id | .
     qq|FROM $arap a | .
@@ -133,8 +142,10 @@ sub get_tuple {
     qq|SELECT a.id | .
     qq|FROM oe a | .
     qq|JOIN $cv ct ON (a.${cv}_id = ct.id) | .
-    qq|WHERE ct.id = ?|;
-  my ($dummy) = selectrow_query($form, $dbh, $query, $form->{id}, $form->{id});
+    qq|WHERE ct.id = ?|
+    . $makemodel;
+  my ($dummy) = selectrow_query($form, $dbh, $query, (conv_i($form->{id})) x $num_args);
+
   $form->{status} = "orphaned" unless ($dummy);
 
   $dbh->disconnect;
@@ -146,6 +157,7 @@ sub populate_drop_down_boxes {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form, $provided_dbh) = @_;
+  my $query;
 
   my $dbh = $provided_dbh ? $provided_dbh : $form->dbconnect($myconfig);
 
@@ -181,17 +193,10 @@ sub query_titles_and_greetings {
   $main::lxdebug->enter_sub();
 
   my ( $self, $myconfig, $form ) = @_;
-  my ( %tmp,  $ref );
+  my ( %tmp,  $ref, $query );
 
   my $dbh = $form->dbconnect($myconfig);
 
-  $query =
-    qq|SELECT DISTINCT(cp_greeting) | .
-    qq|FROM contacts | .
-    qq|WHERE cp_greeting ~ '[a-zA-Z]' | .
-    qq|ORDER BY cp_greeting|;
-  $form->{GREETINGS} = [ selectall_array_query($form, $dbh, $query) ];
-
   $query =
     qq|SELECT DISTINCT(greeting) | .
     qq|FROM customer | .
@@ -201,7 +206,7 @@ sub query_titles_and_greetings {
     qq|FROM vendor | .
     qq|WHERE greeting ~ '[a-zA-Z]' | .
     qq|ORDER BY greeting|;
-  my %tmp;
+
   map({ $tmp{$_} = 1; } selectall_array_query($form, $dbh, $query));
   $form->{COMPANY_GREETINGS} = [ sort(keys(%tmp)) ];
 
@@ -306,6 +311,8 @@ sub save_customer {
     qq|account_number = ?, | .
     qq|bank_code = ?, | .
     qq|bank = ?, | .
+    qq|iban = ?, | .
+    qq|bic = ?, | .
     qq|obsolete = ?, | .
     qq|direct_debit = ?, | .
     qq|ustid = ?, | .
@@ -345,6 +352,8 @@ sub save_customer {
     $form->{account_number},
     $form->{bank_code},
     $form->{bank},
+    $form->{iban},
+    $form->{bic},
     $form->{obsolete} ? 't' : 'f',
     $form->{direct_debit} ? 't' : 'f',
     $form->{ustid},
@@ -363,7 +372,6 @@ sub save_customer {
   $query = undef;
   if ( $form->{cp_id} ) {
     $query = qq|UPDATE contacts SET | .
-      qq|cp_greeting = ?, | .
       qq|cp_title = ?,  | .
       qq|cp_givenname = ?, | .
       qq|cp_name = ?, | .
@@ -379,10 +387,10 @@ sub save_customer {
       qq|cp_project = ?, | .
       qq|cp_privatphone = ?, | .
       qq|cp_privatemail = ?, | .
-      qq|cp_birthday = ? | .
+      qq|cp_birthday = ?, | .
+      qq|cp_gender = ? | .
       qq|WHERE cp_id = ?|;
     @values = (
-      $form->{cp_greeting},
       $form->{cp_title},
       $form->{cp_givenname},
       $form->{cp_name},
@@ -399,18 +407,18 @@ sub save_customer {
       $form->{cp_privatphone},
       $form->{cp_privatemail},
       $form->{cp_birthday},
+      $form->{cp_gender} eq 'f' ? 'f' : 'm',
       $form->{cp_id}
       );
   } elsif ( $form->{cp_name} || $form->{cp_givenname} ) {
     $query =
-      qq|INSERT INTO contacts ( cp_cv_id, cp_greeting, cp_title, cp_givenname,  | .
+      qq|INSERT INTO contacts ( cp_cv_id, cp_title, cp_givenname,  | .
       qq|  cp_name, cp_email, cp_phone1, cp_phone2, cp_abteilung, cp_fax, cp_mobile1, | .
       qq|  cp_mobile2, cp_satphone, cp_satfax, cp_project, cp_privatphone, cp_privatemail, | .
-      qq|  cp_birthday) | .
+      qq|  cp_birthday, cp_gender) | .
       qq|VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
     @values = (
       $form->{id},
-      $form->{cp_greeting},
       $form->{cp_title},
       $form->{cp_givenname},
       $form->{cp_name},
@@ -426,7 +434,8 @@ sub save_customer {
       $form->{cp_project},
       $form->{cp_privatphone},
       $form->{cp_privatemail},
-      $form->{cp_birthday}
+      $form->{cp_birthday},
+      $form->{cp_gender} eq 'f' ? 'f' : 'm',
       );
   }
   do_query( $form, $dbh, $query, @values ) if ($query);
@@ -440,9 +449,10 @@ sub save_customer {
   CVar->save_custom_variables('dbh'       => $dbh,
                               'module'    => 'CT',
                               'trans_id'  => $form->{id},
-                              'variables' => $form);
+                              'variables' => $form,
+                              'always_valid' => 1);
 
-  $rc = $dbh->commit();
+  my $rc = $dbh->commit();
   $dbh->disconnect();
 
   $main::lxdebug->leave_sub();
@@ -511,6 +521,8 @@ sub save_vendor {
     qq|  account_number = ?, | .
     qq|  bank_code = ?, | .
     qq|  bank = ?, | .
+    qq|  iban = ?, | .
+    qq|  bic = ?, | .
     qq|  obsolete = ?, | .
     qq|  direct_debit = ?, | .
     qq|  ustid = ?, | .
@@ -521,7 +533,7 @@ sub save_vendor {
     qq|  user_password = ?, | .
     qq|  v_customer_id = ? | .
     qq|WHERE id = ?|;
-  @values = (
+  my @values = (
     $form->{vendornumber},
     $form->{name},
     $form->{greeting},
@@ -548,6 +560,8 @@ sub save_vendor {
     $form->{account_number},
     $form->{bank_code},
     $form->{bank},
+    $form->{iban},
+    $form->{bic},
     $form->{obsolete} ? 't' : 'f',
     $form->{direct_debit} ? 't' : 'f',
     $form->{ustid},
@@ -564,7 +578,6 @@ sub save_vendor {
   $query = undef;
   if ( $form->{cp_id} ) {
     $query = qq|UPDATE contacts SET | .
-      qq|cp_greeting = ?, | .
       qq|cp_title = ?,  | .
       qq|cp_givenname = ?, | .
       qq|cp_name = ?, | .
@@ -580,10 +593,10 @@ sub save_vendor {
       qq|cp_project = ?, | .
       qq|cp_privatphone = ?, | .
       qq|cp_privatemail = ?, | .
-      qq|cp_birthday = ? | .
+      qq|cp_birthday = ?, | .
+      qq|cp_gender = ? | .
       qq|WHERE cp_id = ?|;
     @values = (
-      $form->{cp_greeting},
       $form->{cp_title},
       $form->{cp_givenname},
       $form->{cp_name},
@@ -600,18 +613,18 @@ sub save_vendor {
       $form->{cp_privatphone},
       $form->{cp_privatemail},
       $form->{cp_birthday},
+      $form->{cp_gender} eq 'f' ? 'f' : 'm',
       $form->{cp_id}
       );
   } elsif ( $form->{cp_name} || $form->{cp_givenname} ) {
     $query =
-      qq|INSERT INTO contacts ( cp_cv_id, cp_greeting, cp_title, cp_givenname,  | .
+      qq|INSERT INTO contacts ( cp_cv_id, cp_title, cp_givenname,  | .
       qq|  cp_name, cp_email, cp_phone1, cp_phone2, cp_abteilung, cp_fax, cp_mobile1, | .
       qq|  cp_mobile2, cp_satphone, cp_satfax, cp_project, cp_privatphone, cp_privatemail, | .
-      qq|  cp_birthday) | .
+      qq|  cp_birthday, cp_gender) | .
       qq|VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
     @values = (
       $form->{id},
-      $form->{cp_greeting},
       $form->{cp_title},
       $form->{cp_givenname},
       $form->{cp_name},
@@ -627,7 +640,8 @@ sub save_vendor {
       $form->{cp_project},
       $form->{cp_privatphone},
       $form->{cp_privatemail},
-      $form->{cp_birthday}
+      $form->{cp_birthday},
+      $form->{cp_gender}
       );
   }
   do_query($form, $dbh, $query, @values) if ($query);
@@ -641,9 +655,10 @@ sub save_vendor {
   CVar->save_custom_variables('dbh'       => $dbh,
                               'module'    => 'CT',
                               'trans_id'  => $form->{id},
-                              'variables' => $form);
+                              'variables' => $form,
+                              'always_valid' => 1);
 
-  $rc = $dbh->commit();
+  my $rc = $dbh->commit();
   $dbh->disconnect();
 
   $main::lxdebug->leave_sub();
@@ -683,11 +698,11 @@ sub search {
   my %allowed_sort_columns =
     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";
+  my $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 ne 'id') {
+  if ($sortorder ne 'id' && 1 >= scalar grep { $form->{$_} } qw(l_ordnumber l_quonumber l_invnumber)) {
     $sortorder  = "lower($sortorder) ${sortdir}";
   } else {
     $sortorder .= " ${sortdir}";
@@ -850,7 +865,7 @@ sub get_contact {
     qq|SELECT * FROM contacts c | .
     qq|WHERE cp_id = ? ORDER BY cp_id limit 1|;
   my $sth = prepare_execute_query($form, $dbh, $query, $form->{cp_id});
-  my $ref = $sth->fetchrow_hashref(NAME_lc);
+  my $ref = $sth->fetchrow_hashref("NAME_lc");
 
   map { $form->{$_} = $ref->{$_} } keys %$ref;
 
@@ -876,7 +891,7 @@ sub get_shipto {
   my $query = qq|SELECT * FROM shipto WHERE shipto_id = ?|;
   my $sth = prepare_execute_query($form, $dbh, $query, $form->{shipto_id});
 
-  my $ref = $sth->fetchrow_hashref(NAME_lc);
+  my $ref = $sth->fetchrow_hashref("NAME_lc");
 
   map { $form->{$_} = $ref->{$_} } keys %$ref;
 
@@ -901,6 +916,7 @@ sub get_delivery {
 
   my $arap = $form->{db} eq "vendor" ? "ap" : "ar";
   my $db = $form->{db} eq "customer" ? "customer" : "vendor";
+  my $qty_sign = $form->{db} eq 'vendor' ? ' * -1 AS qty' : '';
 
   my $where = " WHERE 1=1 ";
   my @values;
@@ -922,9 +938,10 @@ sub get_delivery {
     push(@values, conv_date($form->{to}));
   }
   my $query =
-    qq|SELECT s.shiptoname, i.qty, | .
-    qq|  ${arap}.transdate, ${arap}.invnumber, ${arap}.ordnumber, | .
-    qq|  i.description, i.unit, i.sellprice | .
+    qq|SELECT s.shiptoname, i.qty $qty_sign, | .
+    qq|  ${arap}.id, ${arap}.transdate, ${arap}.invnumber, ${arap}.ordnumber, | .
+    qq|  i.description, i.unit, i.sellprice, | .
+    qq|  oe.id AS oe_id, invoice | .
     qq|FROM $arap | .
     qq|LEFT JOIN shipto s ON | .
     ($arap eq "ar"
@@ -932,6 +949,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|LEFT JOIN oe ON (oe.ordnumber = ${arap}.ordnumber AND NOT ${arap}.ordnumber = '') | .
     $where .
     qq|ORDER BY ${arap}.transdate DESC LIMIT 15|;
 
@@ -1031,28 +1049,44 @@ sub delete_shipto {
   my %myconfig  = %main::myconfig;
   my $dbh       = $form->get_standard_dbh(\%myconfig);
 
-  do_query($form, $dbh, qq|UPDATE shipto SET trans_id = NULL WHERE shipto_id = ?|, $shipto_id);
+  do_query($form, $dbh, qq|UPDATE contacts SET cp_cv_id = NULL WHERE cp_id = ?|, $shipto_id);
 
   $dbh->commit();
 
   $main::lxdebug->leave_sub();
 }
 
-sub delete_shipto {
+sub get_bank_info {
   $main::lxdebug->enter_sub();
 
-  my $self      = shift;
-  my $shipto_id = shift;
+  my $self     = shift;
+  my %params   = @_;
 
-  my $form      = $main::form;
-  my %myconfig  = %main::myconfig;
-  my $dbh       = $form->get_standard_dbh(\%myconfig);
+  Common::check_params(\%params, qw(vc id));
 
-  do_query($form, $dbh, qq|UPDATE contacts SET cp_cv_id = NULL WHERE cp_id = ?|, $shipto_id);
+  my $myconfig = \%main::myconfig;
+  my $form     = $main::form;
 
-  $dbh->commit();
+  my $dbh      = $params{dbh} || $form->get_standard_dbh($myconfig);
+
+  my $table        = $params{vc} eq 'customer' ? 'customer' : 'vendor';
+  my @ids          = ref $params{id} eq 'ARRAY' ? @{ $params{id} } : ($params{id});
+  my $placeholders = join ", ", ('?') x scalar @ids;
+  my $query        = qq|SELECT id, name, account_number, bank, bank_code, iban, bic
+                        FROM ${table}
+                        WHERE id IN (${placeholders})|;
+
+  my $result       = selectall_hashref_query($form, $dbh, $query, map { conv_i($_) } @ids);
+
+  if (ref $params{id} eq 'ARRAY') {
+    $result = { map { $_->{id} => $_ } @{ $result } };
+  } else {
+    $result = $result->[0] || { 'id' => $params{id} };
+  }
 
   $main::lxdebug->leave_sub();
+
+  return $result;
 }
 
 1;