Leerzeichen am Ende bei curr(ency) entfernen.

In der Datenbank werden f. Währungen drei Zeichen gespeichert. Eine
Währung mit zwei Zeichen hat dann ein Leerzeichen am Ende und der
Vergleich in den Maske schlägt fehl, wenn es dort bleibt.

diff --git a/SL/Form.pm b/SL/Form.pm
index b21f94c71c8c16209e52a43fa868bab796d19d65..a5c2abec9c2fa668dfdfcace3b82416def13f079 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -2968,6 +2968,9 @@ sub create_links {
       $self->{$key} = $ref->{$key};
     }
 
       $self->{$key} = $ref->{$key};
     }
 

+    # remove any trailing whitespace
+    $self->{currency} =~ s/\s*$//;
+

     my $transdate = "current_date";
     if ($self->{transdate}) {
       $transdate = $dbh->quote($self->{transdate});
     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;
 
 
   map { $self->{$_} = $ref->{$_} } values %column_map;
 

+  # remove any trailing whitespace
+  $self->{currency} =~ s/\s*$// if $self->{currency};
+

   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }
 

diff --git a/SL/IR.pm b/SL/IR.pm
index 8536aad4fabeea997402546a9204b8b31aacd02a..2bb56a720d715b7edf2540e4d355712ca61dee4c 100644 (file)
--- 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;
 
   $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
   $form->{exchangerate}  = $form->get_exchangerate($dbh, $form->{currency}, $form->{invdate}, "sell");
 
   # get shipto

diff --git a/SL/IS.pm b/SL/IS.pm
index da801fd5296272beaa6404b18a7f7cdfdac0cfe6..d90a0d0dbffd2e669e570c5e7bd499bb8179d774 100644 (file)
--- 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 };
 
     $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");
 
 
     $form->{exchangerate} = $form->get_exchangerate($dbh, $form->{currency}, $form->{invdate}, "buy");
 

diff --git a/SL/OE.pm b/SL/OE.pm
index 61360996b658c813bdf6b11154ccbdca52ab25b8..5bf2a3da969c5e318eb6f1f6b1571df3b5607c89 100644 (file)
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -806,6 +806,9 @@ sub retrieve {
     if ($ref) {
       map { $form->{$_} = $ref->{$_} } keys %$ref;
 
     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
       $form->{saved_xyznumber} = $form->{$form->{type} =~ /_quotation$/ ? "quonumber" : "ordnumber"};
 
       # set all entries for multiple ids blank that yield different information