SL::Helper::ShippedQty: SQL Fehler im stock_fill_up query

[mfinanz.git] / SL / Helper / ShippedQty.pm

diff --git a/SL/Helper/ShippedQty.pm b/SL/Helper/ShippedQty.pm
index 2054513dedad94984858d4cbe30137eeb22b079a..80ee73d9cdc770d0582de6c332baa09120fcdb10 100644 (file)
--- a/SL/Helper/ShippedQty.pm
+++ b/SL/Helper/ShippedQty.pm
@@ -7,7 +7,7 @@ use SL::AM;
 use Scalar::Util qw(blessed);
 use SL::DBUtils qw(selectall_hashref_query selectall_as_map);
 use List::Util qw(min);
 use Scalar::Util qw(blessed);
 use SL::DBUtils qw(selectall_hashref_query selectall_as_map);
 use List::Util qw(min);

-use List::MoreUtils qw(any all);
+use List::MoreUtils qw(any all uniq);

 use List::UtilsBy qw(partition_by);
 use SL::Locale::String qw(t8);
 
 use List::UtilsBy qw(partition_by);
 use SL::Locale::String qw(t8);
 


@@ -61,7 +61,7 @@ my $stock_item_links_query = <<'';
   ORDER BY oi.trans_id, oi.position
 
 my $stock_fill_up_doi_query = <<'';
   ORDER BY oi.trans_id, oi.position
 
 my $stock_fill_up_doi_query = <<'';

-  SELECT doi.id, doi.delivery_order_id, doi.position, doi.parts_id, doi.description, doi.reqdate, doi.serialnumber, i.qty, i.unit
+  SELECT doi.id, doi.delivery_order_id, doi.position, doi.parts_id, doi.description, doi.reqdate, doi.serialnumber, i.qty, p.unit

   FROM delivery_order_items doi
   INNER JOIN parts p                         ON p.id = doi.parts_id
   INNER JOIN delivery_order_items_stock dois ON dois.delivery_order_item_id = doi.id
   FROM delivery_order_items doi
   INNER JOIN parts p                         ON p.id = doi.parts_id
   INNER JOIN delivery_order_items_stock dois ON dois.delivery_order_item_id = doi.id


@@ -108,6 +108,8 @@ sub calculate {
 
   $self->calculate_item_links;
   $self->calculate_fill_up if $self->fill_up;
 
   $self->calculate_item_links;
   $self->calculate_fill_up if $self->fill_up;

+
+  $self;

 }
 
 sub calculate_item_links {
 }
 
 sub calculate_item_links {


@@ -262,8 +264,9 @@ sub init_oe_ids {
 
   die 'oe_ids not initialized in id mode'            if !$self->objects_or_ids;
   die 'objects not initialized before accessing ids' if $self->objects_or_ids && !defined $self->objects;
 
   die 'oe_ids not initialized in id mode'            if !$self->objects_or_ids;
   die 'objects not initialized before accessing ids' if $self->objects_or_ids && !defined $self->objects;

+  die 'objects need to be Order or OrderItem'        if any  {  ref($_) !~ /^SL::DB::Order(?:Item)?$/ } @{ $self->objects };

 
 

-  [ map { $_->id } @{ $self->objects } ]
+  [ uniq map { ref($_) =~ /Item/ ? $_->trans_id : $_->id } @{ $self->objects } ]

 }
 
 sub init_dbh { SL::DB->client->dbh }
 }
 
 sub init_dbh { SL::DB->client->dbh }


@@ -308,6 +311,8 @@ SL::Helper::ShippedQty - Algorithmic module for calculating shipped qty
 
   $helper->calculate($order_object);
   $helper->calculate(\@order_objects);
 
   $helper->calculate($order_object);
   $helper->calculate(\@order_objects);

+  $helper->calculate($orderitem_object);
+  $helper->calculate(\@orderitem_objects);

   $helper->calculate($oe_id);
   $helper->calculate(\@oe_ids);
 
   $helper->calculate($oe_id);
   $helper->calculate(\@oe_ids);