diff --git a/account_financial_report/wizard/aged_partner_balance_wizard.py b/account_financial_report/wizard/aged_partner_balance_wizard.py index 0b26aaeb881..0cd8f370c14 100644 --- a/account_financial_report/wizard/aged_partner_balance_wizard.py +++ b/account_financial_report/wizard/aged_partner_balance_wizard.py @@ -54,17 +54,16 @@ def on_change_account_range(self): ): start_range = int(self.account_code_from.code) end_range = int(self.account_code_to.code) - self.account_ids = self.env["account.account"].search( - [ - ("code", ">=", start_range), - ("code", "<=", end_range), - ("reconcile", "=", True), - ] - ) + domain = [ + ("code", ">=", start_range), + ("code", "<=", end_range), + ("reconcile", "=", True), + ] + if self.company_id: - self.account_ids = self.account_ids.filtered( - lambda a: self.company_id in a.company_ids - ) + domain.append(("company_ids", "in", [self.company_id.id])) + + self.account_ids = self.env["account.account"].search(domain) return { "domain": { "account_code_from": [("reconcile", "=", True)], diff --git a/account_financial_report/wizard/open_items_wizard.py b/account_financial_report/wizard/open_items_wizard.py index c073a20a1f1..88e895eaa0a 100644 --- a/account_financial_report/wizard/open_items_wizard.py +++ b/account_financial_report/wizard/open_items_wizard.py @@ -74,17 +74,14 @@ def on_change_account_range(self): ): start_range = int(self.account_code_from.code) end_range = int(self.account_code_to.code) - self.account_ids = self.env["account.account"].search( - [ - ("code", ">=", start_range), - ("code", "<=", end_range), - ("reconcile", "=", True), - ] - ) + domain = [ + ("code", ">=", start_range), + ("code", "<=", end_range), + ("reconcile", "=", True), + ] if self.company_id: - self.account_ids = self.account_ids.filtered( - lambda a: self.company_id in a.company_ids - ) + domain.append(("company_ids", "in", [self.company_id.id])) + self.account_ids = self.env["account.account"].search(domain) return { "domain": { "account_code_from": [("reconcile", "=", True)], diff --git a/account_financial_report/wizard/trial_balance_wizard.py b/account_financial_report/wizard/trial_balance_wizard.py index 39cecd7fad9..2df5ab8c6bb 100644 --- a/account_financial_report/wizard/trial_balance_wizard.py +++ b/account_financial_report/wizard/trial_balance_wizard.py @@ -88,21 +88,12 @@ def on_change_account_range(self): ): start_range = self.account_code_from.code end_range = self.account_code_to.code - self.account_ids = self.env["account.account"].search( - [("code", ">=", start_range), ("code", "<=", end_range)] - ) - if isinstance(self.account_ids[0].id, models.NewId): - real_ids = self.account_ids.ids - account_ids = self.env["account.account"].browse(real_ids) - if self.company_id: - self.account_ids = account_ids.filtered( - lambda a: self.company_id in a.company_ids - ) - else: - if self.company_id: - self.account_ids = self.account_ids.filtered( - lambda a: self.company_id in a.company_ids - ) + domain = [("code", ">=", start_range), ("code", "<=", end_range)] + + if self.company_id: + domain.append(("company_ids", "in", [self.company_id.id])) + + self.account_ids = self.env["account.account"].search(domain) @api.constrains("show_hierarchy", "show_hierarchy_level") def _check_show_hierarchy_level(self):