From b035d8f9cf4bc33658aebe6892bd779e0f55caf1 Mon Sep 17 00:00:00 2001 From: Roberto Fichera Date: Wed, 14 Feb 2018 19:24:55 +0100 Subject: [PATCH 1/3] [10.0][IMP] account_financial_report_qweb: Add salesperson filter in open_items --- .../report/open_items.py | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/account_financial_report_qweb/report/open_items.py b/account_financial_report_qweb/report/open_items.py index 707c2a15..e55aeec7 100644 --- a/account_financial_report_qweb/report/open_items.py +++ b/account_financial_report_qweb/report/open_items.py @@ -35,6 +35,8 @@ class OpenItemsReport(models.TransientModel): inverse_name='report_id' ) + user_id = fields.Many2one('res.users', string='Salesman') + class OpenItemsReportAccount(models.TransientModel): @@ -188,7 +190,7 @@ WITH INNER JOIN account_move_line ml ON a.id = ml.account_id AND ml.date <= %s """ - if self.filter_partner_ids: + if self.filter_partner_ids or self.user_id: query_inject_account += """ INNER JOIN res_partner p ON ml.partner_id = p.id @@ -213,6 +215,11 @@ WITH AND p.id IN %s """ + if self.user_id: + query_inject_account += """ + AND + p.user_id = %s + """ query_inject_account += """ GROUP BY a.id @@ -249,6 +256,10 @@ FROM query_inject_account_params += ( tuple(self.filter_partner_ids.ids), ) + if self.user_id: + query_inject_account_params += ( + self.user_id.id, + ) query_inject_account_params += ( self.id, self.env.uid, @@ -301,6 +312,11 @@ WITH AND p.id IN %s """ + if self.user_id: + query_inject_partner += """ + AND + p.user_id = %s + """ query_inject_partner += """ GROUP BY ra.id, @@ -334,6 +350,10 @@ FROM query_inject_partner_params += ( tuple(self.filter_partner_ids.ids), ) + if self.user_id: + query_inject_partner_params += ( + self.user_id.id, + ) query_inject_partner_params += ( self.env.uid, ) From 86f86486dc1919435e2a0d7dffade4343cb61fc1 Mon Sep 17 00:00:00 2001 From: Roberto Fichera Date: Wed, 14 Feb 2018 19:27:47 +0100 Subject: [PATCH 2/3] [10.0][IMP] account_financial_report_qweb: Add salesperson in open_items report --- account_financial_report_qweb/report/templates/open_items.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/account_financial_report_qweb/report/templates/open_items.xml b/account_financial_report_qweb/report/templates/open_items.xml index 69a9a4c6..f63307b4 100644 --- a/account_financial_report_qweb/report/templates/open_items.xml +++ b/account_financial_report_qweb/report/templates/open_items.xml @@ -60,11 +60,15 @@