Merge 0b01b03309 into 1ac8744ae8

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,
         )

account_financial_report_qweb/report/templates/open_items.xml

@@ -65,11 +65,15 @@
     <template id="account_financial_report_qweb.report_open_items_qweb_filters">
         <div class="act_as_table data_table" style="width: 100%;">
             <div class="act_as_row labels">
+                <div t-if="o.user_id" class="act_as_cell">Agent</div>
                 <div class="act_as_cell">Date at filter</div>
                 <div class="act_as_cell">Target moves filter</div>
                 <div class="act_as_cell">Account balance at 0 filter</div>
             </div>
             <div class="act_as_row">
+                <div t-if="o.user_id" class="act_as_cell">
+                    <span t-field="o.user_id"/>
+                </div>
                 <div class="act_as_cell">
                     <span t-field="o.date_at"/>
                 </div>

account_financial_report_qweb/wizard/open_items_wizard.py

@@ -99,6 +99,8 @@ class OpenItemsReportWizard(models.TransientModel):
 
             return list(partner_ids)
 
+    user_id = fields.Many2one('res.users', string='Salesman')
+
     @api.onchange('receivable_accounts_only', 'payable_accounts_only')
     def onchange_type_accounts_only(self):
         """Handle receivable/payable accounts only change."""
@@ -153,6 +155,7 @@ class OpenItemsReportWizard(models.TransientModel):
             'company_id': self.company_id.id,
             'filter_account_ids': [(6, 0, self.account_ids.ids)],
             'filter_partner_ids': [(6, 0, self.partner_ids.ids)],
+            'user_id': self.user_id.id,
         }
 
     def _export(self, report_type):

account_financial_report_qweb/wizard/open_items_wizard_view.xml

@@ -19,6 +19,9 @@
                         <field name="hide_account_at_0"/>
                         <field name="foreign_currency"/>
                     </group>
+                    <group name="salesman_filters">
+                        <field name="user_id"/>
+                    </group>
                 </group>
                 <group name="partner_filter" col="1">
                     <label for="partner_ids"/>