tocmo0nlord/Odoo-18.0-20251222
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge PR #1293 into 18.0

Browse Source 
Signed-off-by alexis-via
This commit is contained in:
OCA-git-bot
2025-07-04 16:28:28 +00:00
parent db781d7d32 138b1bff7f
commit 9fa08b221c
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
account_financial_report/wizard/general_ledger_wizard.py
View File

@@ -103,13 +103,10 @@ class GeneralLedgerReportWizard(models.TransientModel):
): ):
start_range = int(self.account_code_from.code) start_range = int(self.account_code_from.code)
end_range = int(self.account_code_to.code) end_range = int(self.account_code_to.code)
self.account_ids = self.env["account.account"].search( domain = [("code", ">=", start_range), ("code", "<=", end_range)]
[("code", ">=", start_range), ("code", "<=", end_range)]
)
if self.company_id: if self.company_id:
self.account_ids = self.account_ids.filtered( domain.append(("company_ids", "in", self.company_id.ids))
lambda a: a.company_id == self.company_id self.account_ids = self.env["account.account"].search(domain)
)
def _init_date_from(self): def _init_date_from(self):
"""set start date to begin of current year if fiscal year running""" """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() self.onchange_type_accounts_only()
else: else:
self.account_ids = self.account_ids.filtered( 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: if self.company_id and self.cost_center_ids:
self.cost_center_ids = self.cost_center_ids.filtered( self.cost_center_ids = self.cost_center_ids.filtered(
@@ -195,7 +192,7 @@ class GeneralLedgerReportWizard(models.TransientModel):
if not self.company_id: if not self.company_id:
return res return res
else: 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"] += [ res["domain"]["account_journal_ids"] += [
("company_id", "=", self.company_id.id) ("company_id", "=", self.company_id.id)
] ]

6
account_financial_report/wizard/open_items_wizard.py
View File

@@ -79,7 +79,7 @@ class OpenItemsReportWizard(models.TransientModel):
) )
if self.company_id: if self.company_id:
self.account_ids = self.account_ids.filtered( 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 { return {
"domain": { "domain": {
@@ -103,13 +103,13 @@ class OpenItemsReportWizard(models.TransientModel):
self.onchange_type_accounts_only() self.onchange_type_accounts_only()
else: else:
self.account_ids = self.account_ids.filtered( 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": []}} res = {"domain": {"account_ids": [], "partner_ids": []}}
if not self.company_id: if not self.company_id:
return res return res
else: 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"]["partner_ids"] += self._get_partner_ids_domain()
return res return res

2
account_financial_report/wizard/trial_balance_wizard.py
View File

@@ -166,7 +166,7 @@ class TrialBalanceReportWizard(models.TransientModel):
if not self.company_id: if not self.company_id:
return res return res
else: 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"]["partner_ids"] += self._get_partner_ids_domain()
res["domain"]["date_range_id"] += [ res["domain"]["date_range_id"] += [
"|", "|",