X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FHelper%2FPayment.pm;h=028f76f3f5a2f76b48b07e325f2cd986cb81421e;hb=19304dbf9867573d08a50b0a9eaaeb0f6d1332c9;hp=8d0174d9b781ef784c0df3cb91df43a4abaf5937;hpb=9f0c5105e2c79feead651fd0de5d9ba725a2c1ff;p=kivitendo-erp.git

diff --git a/SL/DB/Helper/Payment.pm b/SL/DB/Helper/Payment.pm
index 8d0174d9b..028f76f3f 100644
--- a/SL/DB/Helper/Payment.pm
+++ b/SL/DB/Helper/Payment.pm
@@ -79,7 +79,7 @@ sub pay_invoice {
   # currency is either passed or use the invoice currency if it differs from the default currency
   # TODO remove
   my ($exchangerate,$currency);
-  if ($params{currency} || $params{currency_id} || $self->currency_id != $::instance_conf->get_currency_id) {
+  if ($params{currency} || $params{currency_id}) {
     if ($params{currency} || $params{currency_id} ) { # currency was specified
       $currency = SL::DB::Manager::Currency->find_by(name => $params{currency}) || SL::DB::Manager::Currency->find_by(id => $params{currency_id});
     } else { # use invoice currency
@@ -646,8 +646,8 @@ sub skonto_charts {
         };
 
         push @skonto_charts, $rec;
-      };
-  };
+      }
+  }
 
   # if the rounded sum of all rounding_errors reaches 0.01 this sum is
   # subtracted from the largest skonto_amount