perl5.18.0 Kompatibilität: t/helper/csv.t

[mfinanz.git] / SL / CT.pm

diff --git a/SL/CT.pm b/SL/CT.pm
index 37550e4af37c5d168cc260ac1a3542ff693528bb..bf4aad4482c364594a65b3773a9e4edfbc109f91 100644 (file)
--- a/SL/CT.pm
+++ b/SL/CT.pm
@@ -68,12 +68,11 @@ sub get_tuple {
   my $ref = $sth->fetchrow_hashref("NAME_lc");
 
   map { $form->{$_} = $ref->{$_} } keys %$ref;
-  $sth->finish;
 
-  #get name of currency instead of id:
-  $query = qq|SELECT curr FROM currencies WHERE id=?|;
-  ($form->{curr}) = selectrow_query($form, $dbh, $query, conv_i($form->{curr}));
+  # remove any trailing whitespace
+  $form->{curr} =~ s/\s*$//;
 
+  $sth->finish;
   if ( $form->{salesman_id} ) {
     my $query =
       qq|SELECT ct.name AS salesman | .
@@ -320,7 +319,7 @@ sub save_customer {
     qq|user_password = ?, | .
     qq|c_vendor_id = ?, | .
     qq|klass = ?, | .
-    qq|curr = (SELECT id FROM currencies WHERE curr = ?), | .
+    qq|curr = ?, | .
     qq|taxincluded_checked = ? | .
     qq|WHERE id = ?|;
   my @values = (
@@ -363,7 +362,7 @@ sub save_customer {
     $form->{user_password},
     $form->{c_vendor_id},
     conv_i($form->{klass}),
-    $form->{currency},
+    substr($form->{currency}, 0, 3),
     $form->{taxincluded_checked} ne '' ? $form->{taxincluded_checked} : undef,
     $form->{id}
     );
@@ -472,7 +471,7 @@ sub save_vendor {
     qq|  username = ?, | .
     qq|  user_password = ?, | .
     qq|  v_customer_id = ?, | .
-    qq|  curr = (SELECT id FROM currencies WHERE curr = ?) | .
+    qq|  curr = ? | .
     qq|WHERE id = ?|;
   my @values = (
     $form->{vendornumber},
@@ -512,7 +511,7 @@ sub save_vendor {
     $form->{username},
     $form->{user_password},
     $form->{v_customer_id},
-    $form->{currency},
+    substr($form->{currency}, 0, 3),
     $form->{id}
     );
   do_query($form, $dbh, $query, @values);
@@ -1157,7 +1156,6 @@ sub search_contacts {
   my %params    = @_;
 
   my $dbh       = $params{dbh} || $::form->get_standard_dbh;
-  my $vc        = $params{db} eq 'customer' ? 'customer' : 'vendor';
 
   my %sortspecs = (
     'cp_name'   => 'cp_name, cp_givenname',