X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/blobdiff_plain/33e8932ce36d4fbe58a9649b1a233c54f6400d6d..d32410ac096b:/SL/Controller/DeliveryValueReport.pm?ds=sidebyside

diff --git a/SL/Controller/DeliveryValueReport.pm b/SL/Controller/DeliveryValueReport.pm
index f6bc617d1..5fa5c454d 100644
--- a/SL/Controller/DeliveryValueReport.pm
+++ b/SL/Controller/DeliveryValueReport.pm
@@ -17,7 +17,6 @@ use Carp;
 use Data::Dumper;
 
 use Rose::Object::MakeMethods::Generic (
-  scalar => [ qw(db_args flat_filter) ],
   'scalar --get_set_init' => [ qw(models vc all_employees all_businesses) ],
 );
 
@@ -231,7 +230,11 @@ sub link_to {
     my $vc     = $object->is_sales ? 'customer' : 'vendor';
     my $id     = $object->id;
 
-    return "oe.pl?action=$action&type=$type&vc=$vc&id=$id";
+    if ($::instance_conf->get_feature_experimental_order) {
+      return "controller.pl?action=Order/$action&type=$type&id=$id";
+    } else {
+      return "oe.pl?action=$action&type=$type&vc=$vc&id=$id";
+    }
   }
   if ($object->isa('SL::DB::Part')) {
     my $id     = $object->id;
@@ -284,7 +287,7 @@ sub calc_qtys_price {
     my %oi_by_id = map { $_->id => $_ } @$orderitems;
     my $query    = sprintf <<'', join ', ', ("?")x@all_doi_ids;
       SELECT DISTINCT doi.id, closed FROM delivery_orders
-      LEFT JOIN delivery_order_items doi ON (doi.delivery_order_id = delivery_order.id)
+      LEFT JOIN delivery_order_items doi ON (doi.delivery_order_id = delivery_orders.id)
       WHERE doi.id IN (%s)
 
     my %doi_is_closed = selectall_as_map($::form, SL::DB->client->dbh, $query, (id => 'closed'), @all_doi_ids);