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

[MIG] account_financial_report: Migration to 15.0

Browse Source
This commit is contained in:
Jasmin Solanki
2022-03-16 17:30:32 +05:30
committed by chaule97
parent dba1ed1287
commit 2b45a4c62f
27 changed files with 137 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
account_financial_report/report/aged_partner_balance_xlsx.py
View File

@@ -40,7 +40,7 @@ class AgedPartnerBalanceXslx(models.AbstractModel):
"width": 14,
},
3: {
"header": _(u"Age ??? 30 d."),
"header": _("Age ??? 30 d."),
"field": "30_days",
"field_footer_total": "30_days",
"field_footer_percent": "percent_30_days",
@@ -48,7 +48,7 @@ class AgedPartnerBalanceXslx(models.AbstractModel):
"width": 14,
},
4: {
"header": _(u"Age ??? 60 d."),
"header": _("Age ??? 60 d."),
"field": "60_days",
"field_footer_total": "60_days",
"field_footer_percent": "percent_60_days",
@@ -56,7 +56,7 @@ class AgedPartnerBalanceXslx(models.AbstractModel):
"width": 14,
},
5: {
"header": _(u"Age ??? 90 d."),
"header": _("Age ??? 90 d."),
"field": "90_days",
"field_footer_total": "90_days",
"field_footer_percent": "percent_90_days",
@@ -64,7 +64,7 @@ class AgedPartnerBalanceXslx(models.AbstractModel):
"width": 14,
},
6: {
"header": _(u"Age ??? 120 d."),
"header": _("Age ??? 120 d."),
"field": "120_days",
"field_footer_total": "120_days",
"field_footer_percent": "percent_120_days",
@@ -106,7 +106,7 @@ class AgedPartnerBalanceXslx(models.AbstractModel):
"width": 14,
},
9: {
"header": _(u"Age ??? 30 d."),
"header": _("Age ??? 30 d."),
"field": "30_days",
"field_footer_total": "30_days",
"field_footer_percent": "percent_30_days",
@@ -115,7 +115,7 @@ class AgedPartnerBalanceXslx(models.AbstractModel):
"width": 14,
},
10: {
"header": _(u"Age ??? 60 d."),
"header": _("Age ??? 60 d."),
"field": "60_days",
"field_footer_total": "60_days",
"field_footer_percent": "percent_60_days",
@@ -124,7 +124,7 @@ class AgedPartnerBalanceXslx(models.AbstractModel):
"width": 14,
},
11: {
"header": _(u"Age ??? 90 d."),
"header": _("Age ??? 90 d."),
"field": "90_days",
"field_footer_total": "90_days",
"field_footer_percent": "percent_90_days",
@@ -133,7 +133,7 @@ class AgedPartnerBalanceXslx(models.AbstractModel):
"width": 14,
},
12: {
"header": _(u"Age ??? 120 d."),
"header": _("Age ??? 120 d."),
"field": "120_days",
"field_footer_total": "120_days",
"field_footer_percent": "percent_120_days",
@@ -282,7 +282,9 @@ class AgedPartnerBalanceXslx(models.AbstractModel):
"""
name = None
label = _("Partner cumul aged balance")
super().write_ending_balance_from_dict(my_object, name, label, report_data)
return super().write_ending_balance_from_dict(
my_object, name, label, report_data
)
def write_account_footer_from_dict(
self,

7
account_financial_report/report/general_ledger_xlsx.py
View File

@@ -97,7 +97,8 @@ class GeneralLedgerXslx(models.AbstractModel):
return [
[
_("Date range filter"),
_("From: %s To: %s") % (report.date_from, report.date_to),
_("From: %(date_from)s To: %(date_to)s")
% ({"date_from": report.date_from, "date_to": report.date_to}),
],
[
_("Target moves filter"),
@@ -329,7 +330,7 @@ class GeneralLedgerXslx(models.AbstractModel):
label = _("Partner Initial balance")
elif "account" in my_object["type"]:
label = _("Initial balance")
super(GeneralLedgerXslx, self).write_initial_balance_from_dict(
return super(GeneralLedgerXslx, self).write_initial_balance_from_dict(
my_object, label, report_data
)
@@ -341,6 +342,6 @@ class GeneralLedgerXslx(models.AbstractModel):
elif "account" in my_object["type"]:
name = my_object["code"] + " - " + my_object["name"]
label = _("Ending balance")
super(GeneralLedgerXslx, self).write_ending_balance_from_dict(
return super(GeneralLedgerXslx, self).write_ending_balance_from_dict(
my_object, name, label, report_data
)

11
account_financial_report/report/journal_ledger.py
View File

@@ -86,11 +86,11 @@ class JournalLedgerReport(models.AbstractModel):
def _get_move_lines_order(self, move_ids, wizard, journal_ids):
return ""
def _get_move_lines_data(self, ml, wizard, ml_taxes, auto_sequence):
def _get_move_lines_data(self, ml, wizard, ml_taxes, auto_sequence, exigible):
base_debit = (
base_credit
) = tax_debit = tax_credit = base_balance = tax_balance = 0.0
if ml.tax_exigible:
if exigible:
base_debit = ml_taxes and ml.debit or 0.0
base_credit = ml_taxes and ml.credit or 0.0
base_balance = ml_taxes and ml.balance or 0.0
@@ -179,6 +179,10 @@ class JournalLedgerReport(models.AbstractModel):
self._get_move_lines_domain(move_ids, wizard, journal_ids),
order=self._get_move_lines_order(move_ids, wizard, journal_ids),
)
move_lines_exigible = self.env["account.move.line"].search(
self._get_move_lines_domain(move_ids, wizard, journal_ids)
+ self.env["account.move.line"]._get_tax_exigible_domain(),
)
move_line_ids_taxes_data = {}
if move_lines:
# Get the taxes ids for the move lines
@@ -221,8 +225,9 @@ class JournalLedgerReport(models.AbstractModel):
and move_line_ids_taxes_data[ml.id]
or {}
)
exigible = ml in move_lines_exigible
Move_Lines[ml.move_id.id].append(
self._get_move_lines_data(ml, wizard, taxes, auto_sequence)
self._get_move_lines_data(ml, wizard, taxes, auto_sequence, exigible)
)
account_ids_data = self._get_account_data(accounts)
partner_ids_data = self._get_partner_data(partners)

3
account_financial_report/report/journal_ledger_xlsx.py
View File

@@ -134,7 +134,8 @@ class JournalLedgerXslx(models.AbstractModel):
[_("Company"), report.company_id.name],
[
_("Date range filter"),
_("From: %s To: %s") % (report.date_from, report.date_to),
_("From: %(date_from)s To: %(date_to)s")
% ({"date_from": report.date_from, "date_to": report.date_to}),
],
[
_("Target moves filter"),

2
account_financial_report/report/open_items_xlsx.py
View File

@@ -211,6 +211,6 @@ class OpenItemsXslx(models.AbstractModel):
name = my_object["code"] + " - " + my_object["name"]
my_object["residual"] = total_amount[account_id]["residual"]
label = _("Ending balance")
super(OpenItemsXslx, self).write_ending_balance_from_dict(
return super(OpenItemsXslx, self).write_ending_balance_from_dict(
my_object, name, label, report_data
)

28
account_financial_report/report/templates/aged_partner_balance.xml
View File

@@ -17,9 +17,9 @@
<!-- Defines global variables used by internal layout -->
<t t-set="title">
Aged Partner Balance -
<t t-raw="company_name" />
<t t-out="company_name" />
-
<t t-raw="currency_name" />
<t t-out="currency_name" />
</t>
<div class="page">
<div class="row">
@@ -264,7 +264,7 @@
res-model="account.move"
view-type="form"
>
<t t-raw="line['entry']" />
<t t-out="line['entry']" />
</span>
</div>
<!--## journal-->
@@ -274,7 +274,7 @@
res-model="account.journal"
view-type="form"
>
<t t-raw="line['journal']" />
<t t-out="line['journal']" />
</span>
</div>
<!--## account code-->
@@ -284,7 +284,7 @@
res-model="account.account"
view-type="form"
>
<t t-raw="line['account']" />
<t t-out="line['account']" />
</span>
</div>
<!--## partner-->
@@ -294,7 +294,7 @@
res-model="res.partner"
view-type="form"
>
<t t-raw="line['partner']" />
<t t-out="line['partner']" />
</span>
</div>
<!--## ref - label-->
@@ -304,7 +304,7 @@
res-model="account.move.line"
view-type="form"
>
<t t-raw="line['ref_label']" />
<t t-out="line['ref_label']" />
</span>
</div>
<!--## date_due-->
@@ -328,7 +328,7 @@
res-model="account.move.line"
>
<t
t-raw="line['residual']"
t-out="line['residual']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
/>
</span>
@@ -347,7 +347,7 @@
res-model="account.move.line"
>
<t
t-raw="line['current']"
t-out="line['current']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
/>
</span>
@@ -367,7 +367,7 @@
res-model="account.move.line"
>
<t
t-raw="line['30_days']"
t-out="line['30_days']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
/>
</span>
@@ -387,7 +387,7 @@
res-model="account.move.line"
>
<t
t-raw="line['60_days']"
t-out="line['60_days']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
/>
</span>
@@ -407,7 +407,7 @@
res-model="account.move.line"
>
<t
t-raw="line['90_days']"
t-out="line['90_days']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
/>
</span>
@@ -427,7 +427,7 @@
res-model="account.move.line"
>
<t
t-raw="line['120_days']"
t-out="line['120_days']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
/>
</span>
@@ -447,7 +447,7 @@
res-model="account.move.line"
>
<t
t-raw="line['older']"
t-out="line['older']"
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
/>
</span>

2
account_financial_report/report/templates/layouts.xml
View File

@@ -6,7 +6,7 @@
href="/account_financial_report/static/src/css/report.css"
rel="stylesheet"
/>
<t t-raw="0" />
<t t-out="0" />
</div>
<div class="footer">
<div class="row">

6
account_financial_report/report/templates/vat_report.xml
View File

@@ -106,8 +106,7 @@
t-set="domain"
t-value="[('tax_ids', 'in', tax['id']),
('date', '&gt;=', date_from),
('date', '&lt;=', date_to),
('tax_exigible', '=', True)]"
('date', '&lt;=', date_to)]+request.env['account.move.line']._get_tax_exigible_domain()"
/>
<span
t-att-domain="domain"
@@ -125,8 +124,7 @@
t-set="domain"
t-value="[('tax_line_id', '=', tax['id']),
('date', '&gt;=', date_from),
('date', '&lt;=', date_to),
('tax_exigible', '=', True)]"
('date', '&lt;=', date_to)]+request.env['account.move.line']._get_tax_exigible_domain()"
/>
<span
t-att-domain="domain"

7
account_financial_report/report/trial_balance_xlsx.py
View File

@@ -144,7 +144,8 @@ class TrialBalanceXslx(models.AbstractModel):
return [
[
_("Date range filter"),
_("From: %s To: %s") % (report.date_from, report.date_to),
_("From: %(date_from)s To: %(date_to)s")
% ({"date_from": report.date_from, "date_to": report.date_to}),
],
[
_("Target moves filter"),
@@ -162,7 +163,7 @@ class TrialBalanceXslx(models.AbstractModel):
],
[
_("Limit hierarchy levels"),
_("Level %s" % report.show_hierarchy_level)
_("Level %s") % (report.show_hierarchy_level)
if report.limit_hierarchy_level
else _("No limit"),
],
@@ -277,7 +278,7 @@ class TrialBalanceXslx(models.AbstractModel):
line_object.currency_id = line_object.report_account_id.currency_id
elif type_object == "account":
line_object.currency_id = line_object.currency_id
super(TrialBalanceXslx, self).write_line(line_object, report_data)
return super(TrialBalanceXslx, self).write_line(line_object, report_data)
def write_account_footer(self, account, name_value, report_data):
"""Specific function to write account footer for Trial Balance"""

6
account_financial_report/report/vat_report.py
View File

@@ -36,8 +36,7 @@ class VATReport(models.AbstractModel):
("date", ">=", date_from),
("date", "<=", date_to),
("tax_line_id", "!=", False),
("tax_exigible", "=", True),
]
] + self.env["account.move.line"]._get_tax_exigible_domain()
if only_posted_moves:
domain += [("move_id.state", "=", "posted")]
else:
@@ -50,8 +49,7 @@ class VATReport(models.AbstractModel):
("company_id", "=", company_id),
("date", ">=", date_from),
("date", "<=", date_to),
("tax_exigible", "=", True),
]
] + self.env["account.move.line"]._get_tax_exigible_domain()
if only_posted_moves:
domain += [("move_id.state", "=", "posted")]
else: