Email: Kosmetik

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

diff --git a/SL/DB/OrderItem.pm b/SL/DB/OrderItem.pm
index 1925c8085c2a5841cd33499ad96a33723fdb5a35..ffae434d12a039e8870ad766da76cc59ae87f1ed 100644 (file)
--- a/SL/DB/OrderItem.pm
+++ b/SL/DB/OrderItem.pm
@@ -37,13 +37,14 @@ sub shipped_qty {
 sub delivered_qty {
   my ($self) = @_;
 
 sub delivered_qty {
   my ($self) = @_;
 

-  $self->_delivered_qty unless $self->{delivered_qty};
-  return $self->{delivered_qty};
+  return $self->_delivered_qty;

 }
 
 sub _delivered_qty {
   my ($self) = @_;
 
 }
 
 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 = grep { $_->delivered } @$d_orders;
   my $d_orders = $self->order->linked_records(direction => 'to', to => 'SL::DB::DeliveryOrder');
 
   my @d_orders_delivered = grep { $_->delivered } @$d_orders;


@@ -52,6 +53,8 @@ sub _delivered_qty {
 
   require SL::AM;
   $self->{delivered_qty} =  sum(map { AM->convert_unit($_->unit => $self->unit) * $_->qty } @doi_delivered);
 
   require SL::AM;
   $self->{delivered_qty} =  sum(map { AM->convert_unit($_->unit => $self->unit) * $_->qty } @doi_delivered);

+
+  return $self->{delivered_qty};

 }
 
 sub value_of_goods {
 }
 
 sub value_of_goods {


@@ -59,8 +62,8 @@ sub value_of_goods {
 
   my $price_factor = $self->price_factor || 1;
 
 
   my $price_factor = $self->price_factor || 1;
 

-  $self->_delivered_qty unless $self->{delivered_qty};
-  return ($self->{delivered_qty} * $self->sellprice * (1 - $self->discount ) / $price_factor);
+  $self->_delivered_qty;
+  return ($self->_delivered_qty * $self->sellprice * (1 - $self->discount ) / $price_factor);

 }
 
 sub taxincluded {
 }
 
 sub taxincluded {