Skip to content

Commit 3e6122b

Browse files
TennyMktTennyMkt
committed
[FIX] l10n_it_financial_statement: tolta _get_xlsx_name e altre migliorie
1 parent 63b2fa0 commit 3e6122b

15 files changed

Lines changed: 888 additions & 609 deletions

‎l10n_it_financial_statement_eu/README.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ITA - Bilancio UE con XBRL
33
==========================
44

5-
..
5+
..
66
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
77
!! This file is generated by oca-gen-addon-readme !!
88
!! changes will be overwritten. !!
@@ -177,7 +177,7 @@ promote its widespread use.
177177

178178
Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
179179

180-
|maintainer-mktsrl|
180+
|maintainer-mktsrl|
181181

182182
This module is part of the `OCA/l10n-italy <https://github.com/OCA/l10n-italy/tree/16.0-mig-l10n_it_financial_statement_eu/l10n_it_financial_statement_eu>`_ project on GitHub.
183183

‎l10n_it_financial_statement_eu/__manifest__.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
"assets": {
2424
"web.assets_backend": [
2525
"l10n_it_financial_statement_eu/static/src/js/client_action.esm.js",
26-
"l10n_it_financial_statement_eu/static/src/js/report.esm.js",
2726
"l10n_it_financial_statement_eu/static/src/xml/report.xml",
2827
],
2928
},

‎l10n_it_financial_statement_eu/i18n/it.po‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -235,12 +235,20 @@ msgid "Export Financial statement EU in XLSX format"
235235
msgstr "Esportazione del bilancio UE in formato XLSX"
236236

237237
#. module: l10n_it_financial_statement_eu
238+
#. odoo-javascript
239+
#. odoo-python
238240
#: model_terms:ir.ui.view,arch_db:l10n_it_financial_statement_eu.financial_statement_eu_wizard_view
241+
#: code:addons/l10n_it_financial_statement_eu/static/src/xml/report.xml:0
242+
#, python-format
239243
msgid "Export XBRL"
240244
msgstr "Esporta XBRL"
241245

242246
#. module: l10n_it_financial_statement_eu
247+
#. odoo-javascript
248+
#. odoo-python
243249
#: model_terms:ir.ui.view,arch_db:l10n_it_financial_statement_eu.financial_statement_eu_wizard_view
250+
#: code:addons/l10n_it_financial_statement_eu/static/src/xml/report.xml:0
251+
#, python-format
244252
msgid "Export XLSX"
245253
msgstr "Esporta XLSX"
246254

@@ -483,9 +491,12 @@ msgstr "NON QUADRATO"
483491
#. module: l10n_it_financial_statement_eu
484492
#: code:addons/l10n_it_financial_statement_eu/models/financial_statement_eu.py:0
485493
#, python-format
486-
msgid ""
487-
"Unbalanced financial statements: {:s} (Assets) - {:s} (Liabilities) = {:s}"
488-
msgstr "Bilancio NON quadrato: {:s} (Attivo) - {:s} (Passivo) = {:s}"
494+
msgid "Unbalanced financial statements: "
495+
"%(tot_assets)s (Assets) - %(tot_liabilities)s (Liabilities)"
496+
" = %(diff)s"
497+
msgstr "Bilancio NON quadrato: "
498+
"%(tot_assets)s (Attivo) - %(tot_liabilities)s (Passivo)"
499+
" = %(diff)s"
489500

490501
#. module: l10n_it_financial_statement_eu
491502
#: model:ir.model.fields,field_description:l10n_it_financial_statement_eu.field_financial_statement_eu_wizard__financial_statement_log_ids
@@ -536,11 +547,6 @@ msgstr "ATTENZIONE:"
536547
msgid "Wizard for Financial statement EU calculation"
537548
msgstr "Wizard per calcolo bilancio UE"
538549

539-
#. module: l10n_it_financial_statement_eu
540-
#: model:ir.actions.report,name:l10n_it_financial_statement_eu.action_report_financial_statement_eu_xbrl
541-
msgid "XBRL-financial-statements"
542-
msgstr "XBRL-bilancio-esercizio"
543-
544550
#. module: l10n_it_financial_statement_eu
545551
#: code:addons/l10n_it_financial_statement_eu/report/financial_statement_eu_report.py:0
546552
#, python-format

‎l10n_it_financial_statement_eu/i18n/l10n_it_financial_statement_eu.pot‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -225,13 +225,20 @@ msgid "Export Financial statement EU in XLSX format"
225225
msgstr ""
226226

227227
#. module: l10n_it_financial_statement_eu
228+
#. odoo-javascript
229+
#. odoo-python
228230
#: model_terms:ir.ui.view,arch_db:l10n_it_financial_statement_eu.financial_statement_eu_wizard_view
231+
#: code:addons/l10n_it_financial_statement_eu/static/src/xml/report.xml:0
229232
#, python-format
230233
msgid "Export XBRL"
231234
msgstr ""
232235

233236
#. module: l10n_it_financial_statement_eu
237+
#. odoo-javascript
238+
#. odoo-python
234239
#: model_terms:ir.ui.view,arch_db:l10n_it_financial_statement_eu.financial_statement_eu_wizard_view
240+
#: code:addons/l10n_it_financial_statement_eu/static/src/xml/report.xml:0
241+
#, python-format
235242
msgid "Export XLSX"
236243
msgstr ""
237244

@@ -474,8 +481,9 @@ msgstr ""
474481
#. module: l10n_it_financial_statement_eu
475482
#: code:addons/l10n_it_financial_statement_eu/models/financial_statement_eu.py:0
476483
#, python-format
477-
msgid ""
478-
"Unbalanced financial statements: {:s} (Assets) - {:s} (Liabilities) = {:s}"
484+
msgid "Unbalanced financial statements: "
485+
"%(tot_assets)s (Assets) - %(tot_liabilities)s (Liabilities)"
486+
" = %(diff)s"
479487
msgstr ""
480488

481489
#. module: l10n_it_financial_statement_eu
@@ -527,11 +535,6 @@ msgstr ""
527535
msgid "Wizard for Financial statement EU calculation"
528536
msgstr ""
529537

530-
#. module: l10n_it_financial_statement_eu
531-
#: model:ir.actions.report,name:l10n_it_financial_statement_eu.action_report_financial_statement_eu_xbrl
532-
msgid "XBRL-financial-statements"
533-
msgstr ""
534-
535538
#. module: l10n_it_financial_statement_eu
536539
#: code:addons/l10n_it_financial_statement_eu/report/financial_statement_eu_report.py:0
537540
#: code:addons/l10n_it_financial_statement_eu/report/financial_statement_eu_report.py:0

‎l10n_it_financial_statement_eu/migrations/16.0.1.0.0/pre-migrate.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,13 @@ def migrate(env, version):
117117
for old_xml_id, new_xml_id in RENAMED_XMLIDS
118118
],
119119
)
120-
# without forcing rename_tables this error occurs:
121-
# Keep unexpected index account_account_deprecated_index on table account_account
120+
122121
openupgrade.rename_tables(
123122
env.cr, [("account_balance_eu", "financial_statement_eu")]
124123
)
124+
openupgrade.rename_tables(
125+
env.cr, [("account_balance_eu_log", "financial_statement_eu_log")]
126+
)
127+
openupgrade.rename_tables(
128+
env.cr, [("account_balance_eu_wizard", "financial_statement_eu_wizard")]
129+
)

‎l10n_it_financial_statement_eu/models/financial_statement_eu.py‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def _compute_complete_name(self):
8282
p = line.parent_id.get_parent_path()
8383
else:
8484
p = ""
85-
line.complete_name = "[%s] %s%s" % (line.code, p, line.name)
85+
line.complete_name = f"[{line.code}] {p}{line.name}"
8686

8787
def name_get(self):
8888
res = []
@@ -503,19 +503,22 @@ def cal_financial_statement_eu_data(self, form_data):
503503
financial_statement_state = "UNBALANCED"
504504
log_warnings = log_warnings + (
505505
_(
506-
"Unbalanced financial statements: {:s} (Assets) - {:s} (Liabilities) = {:s}"
507-
).format(
508-
formatLang(
506+
"Unbalanced financial statements: "
507+
"%(tot_assets)s (Assets) - %(tot_liabilities)s (Liabilities)"
508+
" = %(diff)s"
509+
)
510+
% {
511+
"tot_assets": formatLang(
509512
self.env,
510513
financial_statement_eu_lines["PA"]["rounded_amount"],
511514
currency_obj=currency_id,
512515
),
513-
formatLang(
516+
"tot_liabilities": formatLang(
514517
self.env,
515518
financial_statement_eu_lines["PP"]["rounded_amount"],
516519
currency_obj=currency_id,
517520
),
518-
formatLang(
521+
"diff": formatLang(
519522
self.env,
520523
tools.float_round(
521524
financial_statement_eu_lines["PA"]["rounded_amount"]
@@ -524,7 +527,7 @@ def cal_financial_statement_eu_data(self, form_data):
524527
),
525528
currency_obj=currency_id,
526529
),
527-
)
530+
}
528531
)
529532
if len(unlinked_account) > 0:
530533
financial_statement_state = "UNLINKED_ACCOUNTS"

‎l10n_it_financial_statement_eu/pyproject.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[build-system]
2+
requires = ["whool"]
3+
build-backend = "whool.buildapi"

‎l10n_it_financial_statement_eu/report/financial_statement_eu_report.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,14 +125,12 @@ class FinancialStatementEuXBRLReport(models.AbstractModel):
125125
def get_xbrl_data_tag(self, str_field, str_year, value, decimal_precision=-1):
126126
complete_field = "itcc-ci:" + str_field
127127
if decimal_precision >= 0:
128-
altri_attr = ' unitRef="eur" decimals="{}"'.format(decimal_precision)
128+
altri_attr = f' unitRef="eur" decimals="{decimal_precision}"'
129129
value = f"{value:.{decimal_precision}f}"
130130
else:
131131
altri_attr = ""
132-
return """
133-
<{} contextRef="{}"{}>{}</{}>""".format(
134-
complete_field, str_year, altri_attr, value, complete_field
135-
)
132+
return f"""
133+
<{complete_field} contextRef="{str_year}"{altri_attr}>{value}</{complete_field}>"""
136134

137135
def get_financial_statement_line_tags(
138136
self,

0 commit comments

Comments
 (0)
⚡