X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FHelper%2FPriceTaxCalculator.pm;h=44c65119603194f8e89d2c6413c4fb1a9305a114;hb=4f43ec85816b8f5c9031ff35adfa9e0d33c4306f;hp=07ad5b11de1bdb94765f37a7d0281d1de86f146a;hpb=c21d2acca00997c4ca0be66f053dfdd0180f68f8;p=kivitendo-erp.git diff --git a/SL/DB/Helper/PriceTaxCalculator.pm b/SL/DB/Helper/PriceTaxCalculator.pm index 07ad5b11d..44c651196 100644 --- a/SL/DB/Helper/PriceTaxCalculator.pm +++ b/SL/DB/Helper/PriceTaxCalculator.pm @@ -3,7 +3,7 @@ package SL::DB::Helper::PriceTaxCalculator; use strict; use parent qw(Exporter); -our @EXPORT = qw(calculate_prices_and_taxes); +our @EXPORT = qw(calculate_prices_and_taxes _calculate_item); use Carp; use List::Util qw(sum min max); @@ -19,7 +19,7 @@ sub calculate_prices_and_taxes { require SL::DB::PriceFactor; require SL::DB::Unit; - SL::DB::Part->load_cached(map { $_->parts_id } @{ $self->items }) if @{ $self->items }; + SL::DB::Part->load_cached(map { $_->parts_id } @{ $self->items }) if @{ $self->items || [] }; 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 }; @@ -75,6 +75,8 @@ sub _calculate_item { my ($self, $item, $idx, $data, %params) = @_; my $part = SL::DB::Part->load_cached($item->parts_id); + return unless $item->part; + my $part_unit = $data->{units_by_name}->{ $part->unit }; my $item_unit = $data->{units_by_name}->{ $item->unit };