Verbesserungen Einkaufs-Lieferplan

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

diff --git a/SL/DB/OrderItem.pm b/SL/DB/OrderItem.pm
index 3b868d3..058d04b 100644 (file)
--- a/SL/DB/OrderItem.pm
+++ b/SL/DB/OrderItem.pm
@@ -3,7 +3,6 @@ package SL::DB::OrderItem;
 use strict;
 
 use List::Util qw(sum);
-use SL::AM;
 
 use SL::DB::MetaSetup::OrderItem;
 use SL::DB::Manager::OrderItem;
@@ -11,30 +10,10 @@ use SL::DB::Helper::CustomVariables (
   sub_module  => 'orderitems',
   cvars_alias => 1,
   overloads   => {
-    parts_id => 'SL::DB::Part',
-  },
-);
-
-__PACKAGE__->meta->add_relationship(
-  part => {
-    type         => 'one to one',
-    class        => 'SL::DB::Part',
-    column_map   => { parts_id => 'id' },
-  },
-  price_factor_obj => {
-    type           => 'one to one',
-    class          => 'SL::DB::PriceFactor',
-    column_map     => { price_factor_id => 'id' },
-  },
-  unit_obj       => {
-    type         => 'one to one',
-    class        => 'SL::DB::Unit',
-    column_map   => { unit => 'name' },
-  },
-  order => {
-    type         => 'one to one',
-    class        => 'SL::DB::Order',
-    column_map   => { trans_id => 'id' },
+    parts_id => {
+      class => 'SL::DB::Part',
+      module => 'IC',
+    }
   },
 );
 
@@ -51,7 +30,34 @@ sub shipped_qty {
   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;
 
+  require SL::AM;
   return sum(map { AM->convert_unit($_->unit => $self->unit) * $_->qty } @doi);
 }
 
+sub delivered_qty {
+  my ($self) = @_;
+
+  my $d_orders = $self->order->linked_records(direction => 'to', to => 'SL::DB::DeliveryOrder');
+
+  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);
+}
+
+sub value_of_goods {
+  my ($self) = @_;
+
+  my $price_factor = $self->price_factor || 1;
+
+  return ($self->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;