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

[IMP] account_financial_report: reversed variable only_one_unaffected_earnings_account

Browse Source
This commit is contained in:
Henrik Norlin
2024-03-31 07:28:42 +02:00
committed by chaule97
parent 0a4dd5df6c
commit 9bf114754e
4 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
account_financial_report/wizard/general_ledger_wizard.py
View File

@@ -56,8 +56,10 @@ class GeneralLedgerReportWizard(models.TransientModel):
cost_center_ids = fields.Many2many(
comodel_name="account.analytic.account", string="Filter cost centers"
)
not_only_one_unaffected_earnings_account = fields.Boolean(readonly=True)
only_one_unaffected_earnings_account = fields.Boolean(
readonly=True,
default=lambda self: self._only_one_unaffected_earnings_account(),
)
foreign_currency = fields.Boolean(
string="Show foreign currency",
help="Display foreign currency for move lines, unless "
@@ -141,16 +143,21 @@ class GeneralLedgerReportWizard(models.TransientModel):
else:
wiz.fy_start_date = False
@api.onchange("company_id")
def onchange_company_id(self):
"""Handle company change."""
def _only_one_unaffected_earnings_account(self):
count = self.env["account.account"].search_count(
[
("account_type", "=", "equity_unaffected"),
("company_id", "=", self.company_id.id),
("company_id", "=", self.company_id.id or self.env.company.id),
]
)
self.not_only_one_unaffected_earnings_account = count != 1
return count == 1
@api.onchange("company_id")
def onchange_company_id(self):
"""Handle company change."""
self.only_one_unaffected_earnings_account = (
self._only_one_unaffected_earnings_account()
)
if (
self.company_id
and self.date_range_id.company_id

13
account_financial_report/wizard/general_ledger_wizard_view.xml
View File

@@ -13,7 +13,7 @@
groups="base.group_multi_company"
/>
</group>
<div invisible="not_only_one_unaffected_earnings_account == True">
<div invisible="not only_one_unaffected_earnings_account">
<group name="filters">
<group name="date_range">
<field name="date_range_id" />
@@ -93,11 +93,8 @@
</page>
</notebook>
</div>
<div invisible="not_only_one_unaffected_earnings_account == False">
<field
name="not_only_one_unaffected_earnings_account"
invisible="1"
/>
<div invisible="only_one_unaffected_earnings_account">
<field name="only_one_unaffected_earnings_account" invisible="1" />
<group />
<h4>
General Ledger can be computed only if selected company have
@@ -106,7 +103,7 @@
<group />
</div>
<footer>
<div invisible="not_only_one_unaffected_earnings_account == True">
<div invisible="not only_one_unaffected_earnings_account">
<button
name="button_export_html"
string="View"
@@ -129,7 +126,7 @@
or
<button string="Cancel" class="oe_link" special="cancel" />
</div>
<div invisible="not_only_one_unaffected_earnings_account == False">
<div invisible="only_one_unaffected_earnings_account">
<button string="Cancel" class="oe_link" special="cancel" />
</div>
</footer>

22
account_financial_report/wizard/trial_balance_wizard.py
View File

@@ -50,9 +50,10 @@ class TrialBalanceReportWizard(models.TransientModel):
show_partner_details = fields.Boolean()
partner_ids = fields.Many2many(comodel_name="res.partner", string="Filter partners")
journal_ids = fields.Many2many(comodel_name="account.journal")
not_only_one_unaffected_earnings_account = fields.Boolean(readonly=True)
only_one_unaffected_earnings_account = fields.Boolean(
readonly=True,
default=lambda self: self._only_one_unaffected_earnings_account(),
)
foreign_currency = fields.Boolean(
string="Show foreign currency",
help="Display foreign currency for move lines, unless "
@@ -107,16 +108,21 @@ class TrialBalanceReportWizard(models.TransientModel):
else:
wiz.fy_start_date = False
@api.onchange("company_id")
def onchange_company_id(self):
"""Handle company change."""
def _only_one_unaffected_earnings_account(self):
count = self.env["account.account"].search_count(
[
("account_type", "=", "equity_unaffected"),
("company_id", "=", self.company_id.id),
("company_id", "=", self.company_id.id or self.env.company.id),
]
)
self.not_only_one_unaffected_earnings_account = count != 1
return count == 1
@api.onchange("company_id")
def onchange_company_id(self):
"""Handle company change."""
self.only_one_unaffected_earnings_account = (
self._only_one_unaffected_earnings_account()
)
if (
self.company_id
and self.date_range_id.company_id

13
account_financial_report/wizard/trial_balance_wizard_view.xml
View File

@@ -13,7 +13,7 @@
groups="base.group_multi_company"
/>
</group>
<div invisible="not_only_one_unaffected_earnings_account == True">
<div invisible="not only_one_unaffected_earnings_account">
<group name="filters">
<group name="date_range">
<field name="date_range_id" />
@@ -95,11 +95,8 @@
/>
</group>
</div>
<div invisible="not_only_one_unaffected_earnings_account == False">
<field
name="not_only_one_unaffected_earnings_account"
invisible="1"
/>
<div invisible="only_one_unaffected_earnings_account">
<field name="only_one_unaffected_earnings_account" invisible="1" />
<group />
<h4>
Trial Balance can be computed only if selected company have only
@@ -108,7 +105,7 @@
<group />
</div>
<footer>
<div invisible="not_only_one_unaffected_earnings_account == True">
<div invisible="not only_one_unaffected_earnings_account">
<button
name="button_export_html"
string="View"
@@ -131,7 +128,7 @@
or
<button string="Cancel" class="oe_link" special="cancel" />
</div>
<div invisible="not_only_one_unaffected_earnings_account == False">
<div invisible="only_one_unaffected_earnings_account">
<button string="Cancel" class="oe_link" special="cancel" />
</div>
</footer>