Merge branch 'master' of ssh://lx-office/~/lx-office-erp

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

diff --git a/SL/CT.pm b/SL/CT.pm
index 2397fe7..a661e8c 100644 (file)
--- 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,7 +118,7 @@ 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};
       }
     }
@@ -155,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);
 
@@ -190,7 +193,7 @@ 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);
 
@@ -203,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)) ];
 
@@ -446,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();
@@ -529,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},
@@ -651,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();
@@ -693,7 +698,7 @@ 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';
 
@@ -860,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;
 
@@ -886,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;
 
@@ -936,7 +941,7 @@ sub get_delivery {
     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 | .
+    qq|  oe.id AS oe_id, invoice | .
     qq|FROM $arap | .
     qq|LEFT JOIN shipto s ON | .
     ($arap eq "ar"
@@ -1034,23 +1039,6 @@ sub _delete_selected_notes {
   $main::lxdebug->leave_sub();
 }
 
-sub delete_shipto {
-  $main::lxdebug->enter_sub();
-
-  my $self      = shift;
-  my $shipto_id = shift;
-
-  my $form      = $main::form;
-  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);
-
-  $dbh->commit();
-
-  $main::lxdebug->leave_sub();
-}
-
 sub delete_shipto {
   $main::lxdebug->enter_sub();
 
@@ -1083,7 +1071,7 @@ sub get_bank_info {
 
   my $table        = $params{vc} eq 'customer' ? 'customer' : 'vendor';
   my @ids          = ref $params{id} eq 'ARRAY' ? @{ $params{id} } : ($params{id});
-  my $placeholders = ('?') x scalar @ids;
+  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})|;