X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FDeliveryPlan.pm;h=06cfda9352765e2bcc681527f2bd0e50f1937efc;hb=46b1d1ce939180e1e5f603a7a0beab9b6b09f199;hp=98f168b1ec5e5e424bb55aa75dc10c9e4f0936ad;hpb=3a7079558f44e4b80670327e70b565c8caf52a0e;p=kivitendo-erp.git

diff --git a/SL/Controller/DeliveryPlan.pm b/SL/Controller/DeliveryPlan.pm
index 98f168b1e..06cfda935 100644
--- a/SL/Controller/DeliveryPlan.pm
+++ b/SL/Controller/DeliveryPlan.pm
@@ -15,7 +15,7 @@ use Carp;
 
 use Rose::Object::MakeMethods::Generic (
   scalar => [ qw(db_args flat_filter) ],
-  'scalar --get_set_init' => [ qw(models all_edit_right vc all_employees all_businesses) ],
+  'scalar --get_set_init' => [ qw(models all_edit_right vc use_linked_items all_employees all_businesses) ],
 );
 
 __PACKAGE__->run_before(sub { $::auth->assert('delivery_plan'); });
@@ -91,7 +91,7 @@ sub prepare_report {
   );
   $report->set_columns(%column_defs);
   $report->set_column_order(@columns);
-  $report->set_export_options(qw(list filter vc));
+  $report->set_export_options(qw(list filter vc use_linked_items));
   $report->set_options_from_form;
   $self->models->disable_plugin('paginated') if $report->{options}{output_format} =~ /^(pdf|csv)$/i;
   $self->models->finalize; # for filter laundering
@@ -111,6 +111,23 @@ sub calc_qtys {
 
   my %orderitems_by_id = map { $_->id => $_ } @$orderitems;
 
+  my $query = $self->use_linked_items ? _calc_qtys_query_linked_items(scalar @$orderitems)
+            :                           _calc_qtys_query_match_parts(scalar @$orderitems);
+
+  my $result = SL::DBUtils::selectall_hashref_query($::form, $::form->get_standard_dbh, $query, map { $_->id } @$orderitems);
+
+  for my $row (@$result) {
+    my $item = $orderitems_by_id{ $row->{id} };
+    $item->{shipped_qty}   ||= 0;
+    $item->{delivered_qty} ||= 0;
+    $item->{shipped_qty}    += AM->convert_unit($row->{unit} => $item->unit) * $row->{qty};
+    $item->{delivered_qty}  += AM->convert_unit($row->{unit} => $item->unit) * $row->{qty} if $row->{delivered};
+  }
+}
+
+sub _calc_qtys_query_match_parts {
+  my ($num_items) = @_;
+
   my $query = <<SQL;
     SELECT oi.id, doi.qty, doi.unit, doe.delivered
     FROM record_links rl
@@ -120,18 +137,26 @@ sub calc_qtys {
     WHERE rl.from_table = 'oe'
       AND rl.to_table   = 'delivery_orders'
       AND oi.parts_id   = doi.parts_id
-      AND oi.id IN (@{[ join ', ', ("?")x @$orderitems ]})
+      AND oi.id IN (@{[ join ', ', ("?")x $num_items ]})
 SQL
 
-  my $result = SL::DBUtils::selectall_hashref_query($::form, $::form->get_standard_dbh, $query, map { $_->id } @$orderitems);
+  return $query;
+}
 
-  for my $row (@$result) {
-    my $item = $orderitems_by_id{ $row->{id} };
-    $item->{shipped_qty}   ||= 0;
-    $item->{delivered_qty} ||= 0;
-    $item->{shipped_qty}    += AM->convert_unit($row->{unit} => $item->unit) * $row->{qty};
-    $item->{delivered_qty}  += AM->convert_unit($row->{unit} => $item->unit) * $row->{qty} if $row->{delivered};
-  }
+sub _calc_qtys_query_linked_items {
+  my ($num_items) = @_;
+
+  my $query = <<SQL;
+    SELECT rl.from_id as id, doi.qty, doi.unit, doe.delivered
+    FROM record_links rl
+    INNER JOIN delivery_order_items doi ON (doi.id = rl.to_id)
+    INNER JOIN delivery_orders doe ON (doe.id = doi.delivery_order_id)
+    WHERE rl.from_table LIKE 'orderitems'
+      AND rl.to_table   LIKE 'delivery_order_items'
+      AND rl.from_id IN (@{[ join ', ', ("?")x $num_items ]})
+SQL
+
+  return $query;
 }
 
 sub make_filter_summary {
@@ -183,9 +208,7 @@ sub delivery_plan_query {
   my $vc     = $self->vc;
   my $employee_id = SL::DB::Manager::Employee->current->id;
   my $oe_owner = $_[0]->all_edit_right ? '' : " oe.employee_id = $employee_id AND";
-  # check delivered state for delivery_orders (transferred out) if enabled
-  my $filter_delivered = ($::instance_conf->get_delivery_plan_calculate_transferred_do) ?
-      "AND (SELECT delivered from delivery_orders where id = doi.delivery_order_id)" : '';
+
   [
   "order.${vc}_id" => { gt => 0 },
   'order.closed' => 0,
@@ -214,7 +237,6 @@ sub delivery_plan_query {
           rl.to_table = 'delivery_orders' AND
           rl.to_id = doi.delivery_order_id AND
           oi.parts_id = doi.parts_id
-          $filter_delivered
       ) tuples GROUP BY parts_id, trans_id, qty
     ) partials
     LEFT JOIN orderitems oi ON partials.parts_id = oi.parts_id AND partials.trans_id = oi.trans_id
@@ -267,8 +289,6 @@ sub delivery_plan_query {
           (oe.quotation = 'f' OR oe.quotation IS NULL) AND NOT oe.closed
       ) rl
       LEFT JOIN delivery_order_items doi ON (rl.to_id = doi.delivery_order_id)
-      WHERE 1 = 1
-      $filter_delivered
       GROUP BY rl.from_id, doi.parts_id
     ) agg ON (agg.oid = oi.trans_id AND agg.parts_id = oi.parts_id)
     LEFT JOIN oe ON oe.id = oi.trans_id
@@ -282,7 +302,60 @@ sub delivery_plan_query {
       oe.${vc}_id IS NOT NULL AND
       $oe_owner
       (oe.quotation = 'f' OR oe.quotation IS NULL) AND NOT oe.closed
-  " ],
+  " ], # make emacs happy again: '
+  ]
+}
+
+sub delivery_plan_query_linked_items {
+  my ($self) = @_;
+  my $vc     = $self->vc;
+  my $employee_id = SL::DB::Manager::Employee->current->id;
+  my $oe_owner = $_[0]->all_edit_right ? '' : " oe.employee_id = $employee_id AND";
+
+  [
+  "order.${vc}_id" => { gt => 0 },
+  'order.closed' => 0,
+  or => [ 'order.quotation' => 0, 'order.quotation' => undef ],
+
+  # filter by shipped_qty < qty, read from innermost to outermost
+  'id' => [ \"
+    SELECT id FROM (
+      SELECT oi.qty, oi.id, SUM(doi.qty) AS doi_qty
+      FROM orderitems oi, oe, record_links rl, delivery_order_items doi
+      WHERE
+        oe.id = oi.trans_id AND
+        oe.${vc}_id IS NOT NULL AND
+        (oe.quotation = 'f' OR oe.quotation IS NULL) AND
+        NOT oe.closed AND
+        $oe_owner
+        doi.id = rl.to_id AND
+        rl.from_table = 'orderitems'AND
+        rl.to_table   = 'delivery_order_items' AND
+        rl.from_id = oi.id
+      GROUP BY oi.id
+    ) linked
+    WHERE qty > doi_qty
+
+    UNION ALL
+
+    -- 2. since the join over record_links fails for items not in any delivery order
+    --    retrieve those without record_links at all
+    SELECT oi.id FROM orderitems oi, oe
+    WHERE
+      oe.id = oi.trans_id AND
+      oe.${vc}_id IS NOT NULL AND
+      (oe.quotation = 'f' OR oe.quotation IS NULL) AND
+      NOT oe.closed AND
+      $oe_owner
+      oi.id NOT IN (
+        SELECT from_id
+        FROM record_links rl
+        WHERE
+          rl.from_table ='orderitems' AND
+          rl.to_table = 'delivery_order_items'
+      )
+
+  " ], # make emacs happy again: " ]
   ]
 }
 
@@ -290,6 +363,9 @@ sub init_models {
   my ($self) = @_;
   my $vc     = $self->vc;
 
+  my $query = $self->use_linked_items ? $self->delivery_plan_query_linked_items
+            :                           $self->delivery_plan_query;
+
   SL::Controller::Helper::GetModels->new(
     controller   => $self,
     model        => 'OrderItem',
@@ -300,9 +376,9 @@ sub init_models {
       },
       %sort_columns,
     },
-    query        => $self->delivery_plan_query,
+    query        => $query,
     with_objects => [ 'order', "order.$vc", 'part' ],
-    additional_url_params => { vc => $vc},
+    additional_url_params => { vc => $vc, use_linked_items => $self->use_linked_items },
   );
 }
 
@@ -313,6 +389,10 @@ sub init_vc {
   return $::form->{vc} if ($::form->{vc} eq 'customer' || $::form->{vc} eq 'vendor') || croak "self (DeliveryPlan) has no vc defined";
 }
 
+sub init_use_linked_items {
+  !!$::form->{use_linked_items};
+}
+
 sub init_all_employees {
   return SL::DB::Manager::Employee->get_all_sorted;
 }
@@ -334,7 +414,7 @@ sub link_to {
   }
   if ($object->isa('SL::DB::Part')) {
     my $id     = $object->id;
-    return "ic.pl?action=$action&id=$id";
+    return "controller.pl?action=Part/$action&part.id=$id";
   }
   if ($object->isa('SL::DB::Customer')) {
     my $id     = $object->id;