From: Bernd Blessmann <bibi@online.de>
Date: Wed, 12 Oct 2011 13:51:17 +0000 (+0200)
Subject: Merge branch 'master' of git@vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-2.7.0beta1~230^2~1^2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/80b36869dd9b1ff2ed9063fabe79ca5001dc276e?hp=db7c3a525af246d3373e63b4e8b5b7edc82b0a9f

Merge branch 'master' of git@vc.linet-services.de:public/lx-office-erp
---

diff --git a/SL/Form.pm b/SL/Form.pm
index 6226017f2..a1bb2b1f3 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -2968,6 +2968,9 @@ sub create_links {
       $self->{$key} = $ref->{$key};
     }
 
+    # remove any trailing whitespace
+    $self->{currency} =~ s/\s*$//;
+
     my $transdate = "current_date";
     if ($self->{transdate}) {
       $transdate = $dbh->quote($self->{transdate});
@@ -3144,6 +3147,9 @@ sub lastname_used {
 
   map { $self->{$_} = $ref->{$_} } values %column_map;
 
+  # remove any trailing whitespace
+  $self->{currency} =~ s/\s*$// if $self->{currency};
+
   $main::lxdebug->leave_sub();
 }
 
diff --git a/SL/IR.pm b/SL/IR.pm
index 8536aad4f..2bb56a720 100644
--- a/SL/IR.pm
+++ b/SL/IR.pm
@@ -853,6 +853,9 @@ sub retrieve_invoice {
   $ref = selectfirst_hashref_query($form, $dbh, $query, conv_i($form->{id}));
   map { $form->{$_} = $ref->{$_} } keys %$ref;
 
+  # remove any trailing whitespace
+  $form->{currency} =~ s/\s*$//;
+
   $form->{exchangerate}  = $form->get_exchangerate($dbh, $form->{currency}, $form->{invdate}, "sell");
 
   # get shipto
diff --git a/SL/IS.pm b/SL/IS.pm
index da801fd52..d90a0d0db 100644
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -1478,6 +1478,8 @@ sub retrieve_invoice {
     $ref = selectfirst_hashref_query($form, $dbh, $query, $id);
     map { $form->{$_} = $ref->{$_} } keys %{ $ref };
 
+    # remove any trailing whitespace
+    $form->{currency} =~ s/\s*$//;
 
     $form->{exchangerate} = $form->get_exchangerate($dbh, $form->{currency}, $form->{invdate}, "buy");
 
diff --git a/SL/OE.pm b/SL/OE.pm
index 61360996b..5bf2a3da9 100644
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -806,6 +806,9 @@ sub retrieve {
     if ($ref) {
       map { $form->{$_} = $ref->{$_} } keys %$ref;
 
+      # remove any trailing whitespace
+      $form->{currency} =~ s/\s*$//;
+
       $form->{saved_xyznumber} = $form->{$form->{type} =~ /_quotation$/ ? "quonumber" : "ordnumber"};
 
       # set all entries for multiple ids blank that yield different information