From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 26 Aug 2014 11:47:49 +0000 (+0200)
Subject: Finanzübersicht: VerkäuferIn auch bei wiederkehrende Rechnungen beachten
X-Git-Tag: release-3.2.0beta~336
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=d1d37394a56d920bcffccf275fc70ce3682f9d55;p=kivitendo-erp.git

Finanzübersicht: VerkäuferIn auch bei wiederkehrende Rechnungen beachten
---

diff --git a/SL/Controller/FinancialOverview.pm b/SL/Controller/FinancialOverview.pm
index 49c04698c..e8ed1401a 100644
--- a/SL/Controller/FinancialOverview.pm
+++ b/SL/Controller/FinancialOverview.pm
@@ -91,7 +91,7 @@ sub get_objects {
     purchase_orders        => SL::DB::Manager::Order->get_all(          where => [ and => [ @f_date, @f_salesman, SL::DB::Manager::Order->type_filter('purchase_order')    ]]),
     sales_invoices         => SL::DB::Manager::Invoice->get_all(        where => [ and => [ @f_date, @f_salesman, ]]),
     purchase_invoices      => SL::DB::Manager::PurchaseInvoice->get_all(where => [ and =>  \@f_date ]),
-    periodic_invoices_cfg  => SL::DB::Manager::PeriodicInvoicesConfig->get_all(where => [ active => 1 ]),
+    periodic_invoices_cfg  => SL::DB::Manager::PeriodicInvoicesConfig->get_all(where => [ active => 1, $self->salesman_id ? ('order.salesman_id' => $self->salesman_id) : () ], with_objects => [ qw(order) ]),
   });
 
   $self->objects->{sales_orders} = [ grep { !$_->periodic_invoices_config || !$_->periodic_invoices_config->active } @{ $self->objects->{sales_orders} } ];