X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FDB%2FHelper%2FPriceTaxCalculator.pm;h=e4a91807ba60adeccc176eb5fd05a001033b6b67;hb=013b538f3f804a11ec7056bccd37304daf458feb;hp=0801299fb54d01b6e2a3fb00c3ec3aac36906a9e;hpb=03ff37cb621e68f7d224d2520099ee86f612f833;p=kivitendo-erp.git

diff --git a/SL/DB/Helper/PriceTaxCalculator.pm b/SL/DB/Helper/PriceTaxCalculator.pm
index 0801299fb..e4a91807b 100644
--- a/SL/DB/Helper/PriceTaxCalculator.pm
+++ b/SL/DB/Helper/PriceTaxCalculator.pm
@@ -7,13 +7,13 @@ our @EXPORT = qw(calculate_prices_and_taxes);
 
 use Carp;
 use List::Util qw(sum min);
-use SL::DB::Default;
-use SL::DB::PriceFactor;
-use SL::DB::Unit;
 
 sub calculate_prices_and_taxes {
   my ($self, %params) = @_;
 
+  require SL::DB::PriceFactor;
+  require SL::DB::Unit;
+
   my %units_by_name       = map { ( $_->name => $_ ) } @{ SL::DB::Manager::Unit->get_all        };
   my %price_factors_by_id = map { ( $_->id   => $_ ) } @{ SL::DB::Manager::PriceFactor->get_all };
 
@@ -52,9 +52,11 @@ sub calculate_prices_and_taxes {
 
 sub _get_exchangerate {
   my ($self, $data, %params) = @_;
+  require SL::DB::Default;
 
-  if (($self->curr || '') ne SL::DB::Default->get_default_currency) {
-    $data->{exchangerate}   = $::form->check_exchangerate(\%::myconfig, $self->curr, $self->transdate, $data->{is_sales} ? 'buy' : 'sell');
+  my $currency = $self->currency_id ? $self->currency->name || '' : '';
+  if ($currency ne SL::DB::Default->get_default_currency) {
+    $data->{exchangerate}   = $::form->check_exchangerate(\%::myconfig, $currency, $self->transdate, $data->{is_sales} ? 'buy' : 'sell');
     $data->{exchangerate} ||= $params{exchangerate};
   }
   $data->{exchangerate} ||= 1;