X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/db06bb909aa58d7c6482c7ea1acf7fa3bcf7e858..ecf5e3030a98827f9b2baf6a9d5f181793c8948e:/SL/Controller/DeliveryPlan.pm

diff --git a/SL/Controller/DeliveryPlan.pm b/SL/Controller/DeliveryPlan.pm
index d05b46a12..e741e2204 100644
--- a/SL/Controller/DeliveryPlan.pm
+++ b/SL/Controller/DeliveryPlan.pm
@@ -42,7 +42,6 @@ sub action_list {
   $self->prepare_report;
 
   my $orderitems = $self->models->get;
-
   $self->calc_qtys($orderitems);
   $self->report_generator_list_objects(report => $self->{report}, objects => $orderitems);
 }
@@ -88,7 +87,7 @@ sub prepare_report {
                             visible => $vc eq 'customer',
                            obj_link => sub { $self->link_to($_[0]->order->customer)                                          } },
     value_of_goods    => {      sub => sub { $::form->format_amount(\%::myconfig, $_[0]->value_of_goods, 2) . ' ' . $_[0]->taxincluded },
-                            visible => $::auth->assert('sales_order_edit', 1) && $mode eq 'delivery_value_report' &&   $::instance_conf->get_delivery_plan_show_value_of_goods, },
+                            visible => $mode eq 'delivery_value_report' },
   );
 
   $column_defs{$_}->{text} = $sort_columns{$_} for keys %column_defs;
@@ -122,10 +121,13 @@ sub calc_qtys {
   my ($self, $orderitems) = @_;
   # using $orderitem->shipped_qty 40 times is far too slow. need to do it manually
   #
+
+  return unless scalar @$orderitems;
+
   my %orderitems_by_id = map { $_->id => $_ } @$orderitems;
 
   my $query = <<SQL;
-    SELECT oi.id, doi.qty, doi.qty, doi.unit, doe.delivered
+    SELECT oi.id, doi.qty, doi.unit, doe.delivered
     FROM record_links rl
     INNER JOIN delivery_order_items doi ON (doi.delivery_order_id = rl.to_id)
     INNER JOIN delivery_orders doe ON (doe.id = rl.to_id)