diff --git a/partner_statement/report/activity_statement.py b/partner_statement/report/activity_statement.py index 58242392..a86e3ac0 100644 --- a/partner_statement/report/activity_statement.py +++ b/partner_statement/report/activity_statement.py @@ -138,9 +138,11 @@ class ActivityStatement(models.AbstractModel): @api.multi def _get_report_values(self, docids, data): if not data: + data = {} + if 'company_id' not in data: wiz = self.env["activity.statement.wizard"].with_context( active_ids=docids, model="res.partner" ) - data = wiz.create({})._prepare_statement() + data.update(wiz.create({})._prepare_statement()) data['amount_field'] = 'amount' return super()._get_report_values(docids, data) diff --git a/partner_statement/report/outstanding_statement.py b/partner_statement/report/outstanding_statement.py index 28e8ae9a..74c6a07d 100644 --- a/partner_statement/report/outstanding_statement.py +++ b/partner_statement/report/outstanding_statement.py @@ -117,9 +117,11 @@ class OutstandingStatement(models.AbstractModel): @api.multi def _get_report_values(self, docids, data): if not data: + data = {} + if 'company_id' not in data: wiz = self.env["outstanding.statement.wizard"].with_context( active_ids=docids, model="res.partner" ) - data = wiz.create({})._prepare_statement() + data.update(wiz.create({})._prepare_statement()) data['amount_field'] = 'open_amount' return super()._get_report_values(docids, data) diff --git a/partner_statement/wizard/statement_common.py b/partner_statement/wizard/statement_common.py index e8476a8e..93885210 100644 --- a/partner_statement/wizard/statement_common.py +++ b/partner_statement/wizard/statement_common.py @@ -10,10 +10,17 @@ class StatementCommon(models.AbstractModel): _name = 'statement.common.wizard' _description = 'Statement Reports Common Wizard' + def _get_company(self): + return ( + self.env['res.company'].browse( + self.env.context.get('force_company')) or + self.env.user.company_id + ) + name = fields.Char() company_id = fields.Many2one( comodel_name='res.company', - default=lambda self: self.env.user.company_id, + default=_get_company, string='Company', required=True, )