restart apache2 in postinst

[mfinanz.git] / SL / Controller / DeliveryValueReport.pm

diff --git a/SL/Controller/DeliveryValueReport.pm b/SL/Controller/DeliveryValueReport.pm
index ae2032fccb4d9e160057b744a99401fe72908671..f5608336e0131a5af924293a3cd12434dd1809fe 100644 (file)
--- a/SL/Controller/DeliveryValueReport.pm
+++ b/SL/Controller/DeliveryValueReport.pm
@@ -5,6 +5,7 @@ use parent qw(SL::Controller::Base);
 
 use Clone qw(clone);
 use SL::DB::OrderItem;
+use SL::DB::Order::TypeData qw(:types);
 use SL::DB::Business;
 use SL::Controller::Helper::GetModels;
 use SL::Controller::Helper::ReportGenerator;
@@ -63,10 +64,11 @@ sub action_list {
 sub prepare_report {
   my ($self)      = @_;
 
-  my $vc          = $self->vc;
-  my $report      = SL::ReportGenerator->new(\%::myconfig, $::form);
-  my $csv_option  = $::form->{report_generator_output_format};
-  $self->{report} = $report;
+  my $vc           = $self->vc;
+  my $report       = SL::ReportGenerator->new(\%::myconfig, $::form);
+  my $csv_option   = $::form->{report_generator_output_format};
+  $report->{title} = t8('Delivery Value Report');
+  $self->{report}  = $report;
 
   my @columns     = qw(reqdate customer vendor ordnumber partnumber description unit qty netto_qty
                        not_shipped_qty netto_not_shipped_qty shipped_qty netto_shipped_qty delivered_qty
@@ -192,6 +194,7 @@ sub make_filter_summary {
 sub init_models {
   my ($self) = @_;
   my $vc     = $self->vc;
+  my $record_type = ($vc eq 'customer' ? SALES_ORDER_TYPE() : PURCHASE_ORDER_TYPE());
   SL::Controller::Helper::GetModels->new(
     controller            => $self,
     model                 => 'OrderItem',
@@ -204,7 +207,7 @@ sub init_models {
     },
     # show only open (sales|purchase) orders
     query                 => [ 'order.closed' => '0',  "order.${vc}_id" => { gt => 0 },
-                               'order.quotation' => 0                                  ],
+                               'order.record_type' => $record_type                       ],
     with_objects          => [ 'order', "order.$vc", 'part' ],
     additional_url_params => { vc => $vc},
   )
@@ -232,14 +235,8 @@ sub link_to {
 
   if ($object->isa('SL::DB::Order')) {
     my $type   = $object->type;
-    my $vc     = $object->is_sales ? 'customer' : 'vendor';
     my $id     = $object->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";
-    }
+    return "controller.pl?action=Order/$action&type=$type&id=$id";
   }
   if ($object->isa('SL::DB::Part')) {
     my $id     = $object->id;