diff --git a/account_financial_report/wizard/general_ledger_wizard.py b/account_financial_report/wizard/general_ledger_wizard.py index a9c1149b..edce54c7 100644 --- a/account_financial_report/wizard/general_ledger_wizard.py +++ b/account_financial_report/wizard/general_ledger_wizard.py @@ -103,13 +103,10 @@ class GeneralLedgerReportWizard(models.TransientModel): ): 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)] - ) + domain = [("code", ">=", start_range), ("code", "<=", end_range)] if self.company_id: - self.account_ids = self.account_ids.filtered( - lambda a: a.company_id == self.company_id - ) + domain.append(("company_ids", "in", self.company_id.ids)) + self.account_ids = self.env["account.account"].search(domain) def _init_date_from(self): """set start date to begin of current year if fiscal year running""" @@ -177,7 +174,7 @@ class GeneralLedgerReportWizard(models.TransientModel): self.onchange_type_accounts_only() else: self.account_ids = self.account_ids.filtered( - lambda a: a.company_id == self.company_id + lambda a: self.company_id in a.company_ids ) if self.company_id and self.cost_center_ids: self.cost_center_ids = self.cost_center_ids.filtered( @@ -195,7 +192,7 @@ class GeneralLedgerReportWizard(models.TransientModel): if not self.company_id: return res else: - res["domain"]["account_ids"] += [("company_id", "=", self.company_id.id)] + res["domain"]["account_ids"] += [("company_ids", "in", self.company_id.ids)] res["domain"]["account_journal_ids"] += [ ("company_id", "=", self.company_id.id) ] diff --git a/account_financial_report/wizard/open_items_wizard.py b/account_financial_report/wizard/open_items_wizard.py index 161315a8..dbe7eb89 100644 --- a/account_financial_report/wizard/open_items_wizard.py +++ b/account_financial_report/wizard/open_items_wizard.py @@ -79,7 +79,7 @@ class OpenItemsReportWizard(models.TransientModel): ) if self.company_id: self.account_ids = self.account_ids.filtered( - lambda a: a.company_id == self.company_id + lambda a: self.company_id in a.company_ids ) return { "domain": { @@ -103,13 +103,13 @@ class OpenItemsReportWizard(models.TransientModel): self.onchange_type_accounts_only() else: self.account_ids = self.account_ids.filtered( - lambda a: a.company_id == self.company_id + lambda a: self.company_id in a.company_ids ) res = {"domain": {"account_ids": [], "partner_ids": []}} if not self.company_id: return res else: - res["domain"]["account_ids"] += [("company_id", "=", self.company_id.id)] + res["domain"]["account_ids"] += [("company_ids", "in", self.company_id.ids)] res["domain"]["partner_ids"] += self._get_partner_ids_domain() return res diff --git a/account_financial_report/wizard/trial_balance_wizard.py b/account_financial_report/wizard/trial_balance_wizard.py index edb39bb1..7e9f6c0b 100644 --- a/account_financial_report/wizard/trial_balance_wizard.py +++ b/account_financial_report/wizard/trial_balance_wizard.py @@ -166,7 +166,7 @@ class TrialBalanceReportWizard(models.TransientModel): if not self.company_id: return res else: - res["domain"]["account_ids"] += [("company_id", "=", self.company_id.id)] + res["domain"]["account_ids"] += [("company_ids", "in", self.company_id.ids)] res["domain"]["partner_ids"] += self._get_partner_ids_domain() res["domain"]["date_range_id"] += [ "|",