diff --git a/account_financial_report_qweb/report/open_items.py b/account_financial_report_qweb/report/open_items.py index d939958c..d0928c36 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): @@ -215,7 +217,7 @@ WITH LEFT JOIN res_currency c ON a.currency_id = c.id """ - 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 @@ -240,6 +242,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, c.id @@ -278,6 +285,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, @@ -331,6 +342,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, @@ -364,6 +380,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, ) diff --git a/account_financial_report_qweb/report/templates/open_items.xml b/account_financial_report_qweb/report/templates/open_items.xml index 1f451505..6f93a76e 100644 --- a/account_financial_report_qweb/report/templates/open_items.xml +++ b/account_financial_report_qweb/report/templates/open_items.xml @@ -65,11 +65,15 @@