SL::DB::{Invoice,DeliveryOrder}: Items mit neg. qty beim Wandeln optional weglassen

[kivitendo-erp.git] / SL / DB / OrderItem.pm

diff --git a/SL/DB/OrderItem.pm b/SL/DB/OrderItem.pm
index 1925c80..81e6cd3 100644 (file)
--- a/SL/DB/OrderItem.pm
+++ b/SL/DB/OrderItem.pm
@@ -6,6 +6,7 @@ use List::Util qw(sum);
 
 use SL::DB::MetaSetup::OrderItem;
 use SL::DB::Manager::OrderItem;
+use SL::DB::DeliveryOrderItemsStock;
 use SL::DB::Helper::CustomVariables (
   sub_module  => 'orderitems',
   cvars_alias => 1,
@@ -37,13 +38,14 @@ sub shipped_qty {
 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) = @_;
 
+  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;
@@ -52,6 +54,8 @@ sub _delivered_qty {
 
   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 {
@@ -59,8 +63,22 @@ sub value_of_goods {
 
   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 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 {