X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FOrderItem.pm;h=a6c8ac8f99089255d5ce5bb687cabafda4fa5d30;hb=7ff7dd017542c32a8f8111167fda69857de50910;hp=058d04bfe5409151e0b32c43658d1987feb47125;hpb=7d8de6d3bc1c10309351c115b398d7dc97f5fd3f;p=kivitendo-erp.git

diff --git a/SL/DB/OrderItem.pm b/SL/DB/OrderItem.pm
index 058d04bfe..a6c8ac8f9 100644
--- a/SL/DB/OrderItem.pm
+++ b/SL/DB/OrderItem.pm
@@ -6,6 +6,8 @@ use List::Util qw(sum);
 
 use SL::DB::MetaSetup::OrderItem;
 use SL::DB::Manager::OrderItem;
+use SL::DB::DeliveryOrderItemsStock;
+use SL::DB::Helper::ActsAsList;
 use SL::DB::Helper::CustomVariables (
   sub_module  => 'orderitems',
   cvars_alias => 1,
@@ -19,6 +21,8 @@ use SL::DB::Helper::CustomVariables (
 
 __PACKAGE__->meta->initialize;
 
+__PACKAGE__->configure_acts_as_list(group_by => [qw(trans_id)]);
+
 sub is_price_update_available {
   my $self = shift;
   return $self->origprice > $self->part->sellprice;
@@ -37,6 +41,14 @@ 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 = grep { $_->delivered } @$d_orders;
@@ -44,7 +56,9 @@ sub delivered_qty {
   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 {
@@ -52,7 +66,22 @@ sub value_of_goods {
 
   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 stocked_qty {
+  my ($self) = @_;
+
+  my $d_orders   = $self->order->linked_records(direction => 'to', to => 'SL::DB::DeliveryOrder');
+  my @doi        = grep { $_->parts_id == $self->parts_id } map { $_->orderitems } @$d_orders;
+
+  return 0 if !@doi;
+
+  my $doi_stocks = SL::DB::Manager::DeliveryOrderItemsStock->get_all(query => [delivery_order_item_id => [ map {$_->id} @doi ]]);
+
+  require SL::AM;
+  return sum(map { AM->convert_unit($_->unit => $self->unit) * $_->qty } @{ $doi_stocks });
 }
 
 sub taxincluded {