X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FHelper%2FPriceTaxCalculator.pm;h=44c65119603194f8e89d2c6413c4fb1a9305a114;hb=0310ce713a5de3a825e8e8f7b3a9a0476d9ee7f1;hp=df6113663180752f66cb6c066144fe3457b59274;hpb=209100ca065acebaff1294b0c1d2853529773413;p=kivitendo-erp.git

diff --git a/SL/DB/Helper/PriceTaxCalculator.pm b/SL/DB/Helper/PriceTaxCalculator.pm
index df6113663..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 };
 
@@ -358,15 +360,14 @@ C<linetotal>, C<linetotal_cost>, C<sellprice>, C<tax_amount> and
 C<taxkey_id>.
 
 The items are stored in the same order the items are stored in the
-object that L</calculate_taxes_and_prices> has been called on.
+object that L</calculate_prices_and_taxes> has been called on.
 
 For example:
 
   my $invoice     = SL::DB::Invoice->new(id => 12345)->load;
   my %data        = $invoice->calculate_prices_and_taxes;
-  my $second_item = $invoice->items->[1];
 
-  print "line total of second item: " . $data{items}->[ $second_item->id ]->{linetotal};
+  print "line total of second item: " . $data{items}->[1]->{linetotal};
 
 =back