Email: Kosmetik

[mfinanz.git] / SL / DB / OrderItem.pm

diff --git a/SL/DB/OrderItem.pm b/SL/DB/OrderItem.pm
index 8e15d31b9bb62627384157df32c10b0f5715321f..ffae434d12a039e8870ad766da76cc59ae87f1ed 100644 (file)
--- a/SL/DB/OrderItem.pm
+++ b/SL/DB/OrderItem.pm
@@ -37,25 +37,33 @@ sub shipped_qty {
 sub delivered_qty {
   my ($self) = @_;
 
+  return $self->_delivered_qty;
+}
+
+sub _delivered_qty {
+  my ($self) = @_;
+
+  return $self->{delivered_qty} if $self->{delivered_qty};
+
   my $d_orders = $self->order->linked_records(direction => 'to', to => 'SL::DB::DeliveryOrder');
-  my @d_orders_delivered;
 
-  foreach (@$d_orders) {
-    push (@d_orders_delivered, $_) if $_->delivered;
-  }
+  my @d_orders_delivered = grep { $_->delivered } @$d_orders;
 
   my @doi_delivered      = grep { $_->parts_id == $self->parts_id } map { $_->orderitems } @d_orders_delivered;
 
   require SL::AM;
-  return sum(map { AM->convert_unit($_->unit => $self->unit) * $_->qty } @doi_delivered);
+  $self->{delivered_qty} =  sum(map { AM->convert_unit($_->unit => $self->unit) * $_->qty } @doi_delivered);
+
+  return $self->{delivered_qty};
 }
 
 sub value_of_goods {
   my ($self) = @_;
 
-  my $price_factor = $self->price_factor ? $self->price_factor : 1;
+  my $price_factor = $self->price_factor || 1;
 
-  return ($self->qty * $self->sellprice * (1 - $self->discount ) / $price_factor);
+  $self->_delivered_qty;
+  return ($self->_delivered_qty * $self->sellprice * (1 - $self->discount ) / $price_factor);
 }
 
 sub taxincluded {