X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/b092fef706251cb7f7a10f45036e4b7b2a1bacb0..ba802064109d19f3488e5555ec04491681e37b51:/SL/DB/OrderItem.pm

diff --git a/SL/DB/OrderItem.pm b/SL/DB/OrderItem.pm
index 75d5951d6..ffae434d1 100644
--- a/SL/DB/OrderItem.pm
+++ b/SL/DB/OrderItem.pm
@@ -37,17 +37,38 @@ 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 || 1;
+
+  $self->_delivered_qty;
+  return ($self->_delivered_qty * $self->sellprice * (1 - $self->discount ) / $price_factor);
 }
 
+sub taxincluded {
+  my ($self) = @_;
+
+  return SL::DB::Manager::Order->find_by(id => $self->trans_id)->taxincluded ?  $::locale->text('WARN: Tax included value!') : '';
+}
 1;