Techsystech
/
account-financial-reporting
mirror of https://github.com/OCA/account-financial-reporting.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #898 into 13.0 

Signed-off-by pedrobaeza
pull/906/head
OCA-git-bot 2022-09-07 12:16:28 +00:00
parent db97bee3d3 dde5426bf2
commit f6f9e11e84
9 changed files with 82 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
account_financial_report/README.rst
View File

@ -129,6 +129,7 @@ Contributors
* Sergio Teruel * Sergio Teruel
* Ernesto Tejeda * Ernesto Tejeda
* Alexandre D. Díaz * Alexandre D. Díaz
* Víctor Martínez
* Lois Rilo <lois.rilo@forgeflow.com> * Lois Rilo <lois.rilo@forgeflow.com>
* `Sygel <https://www.sygel.es>`__: * `Sygel <https://www.sygel.es>`__:

8
account_financial_report/i18n/account_financial_report.pot
View File

@ -6,6 +6,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Odoo Server 13.0\n" "Project-Id-Version: Odoo Server 13.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-09-01 13:35+0000\n"
"PO-Revision-Date: 2022-09-01 13:35+0000\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -484,6 +486,11 @@ msgstr ""
msgid "Credit" msgid "Credit"
msgstr "" msgstr ""
#. module: account_financial_report
#: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines
msgid "Cumul cur."
msgstr ""
#. module: account_financial_report #. module: account_financial_report
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0 #: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
#: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines
@ -496,7 +503,6 @@ msgstr ""
#: code:addons/account_financial_report/report/open_items_xlsx.py:0 #: code:addons/account_financial_report/report/open_items_xlsx.py:0
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:0 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:0
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:0 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:0
#: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines
#: model_terms:ir.ui.view,arch_db:account_financial_report.report_journal_ledger_journal_table_header #: model_terms:ir.ui.view,arch_db:account_financial_report.report_journal_ledger_journal_table_header
#: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines_header #: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines_header
#: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_lines_header #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_lines_header

113
account_financial_report/i18n/es.po
View File

@ -6,8 +6,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Odoo Server 12.0+e\n" "Project-Id-Version: Odoo Server 12.0+e\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-21 13:00+0000\n" "POT-Creation-Date: 2022-09-01 13:35+0000\n"
"PO-Revision-Date: 2022-08-26 19:07+0000\n" "PO-Revision-Date: 2022-09-01 15:36+0200\n"
"Last-Translator: Pedro M. Baeza <pedro.baeza@gmail.com>\n" "Last-Translator: Pedro M. Baeza <pedro.baeza@gmail.com>\n"
"Language-Team: \n" "Language-Team: \n"
"Language: es\n" "Language: es\n"
@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n" "Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.3.2\n" "X-Generator: Poedit 3.0.1\n"
#. module: account_financial_report #. module: account_financial_report
#: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_lines_header #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_lines_header
@ -506,6 +506,11 @@ msgstr "Creado el"
msgid "Credit" msgid "Credit"
msgstr "Haber" msgstr "Haber"
#. module: account_financial_report
#: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines
msgid "Cumul cur."
msgstr "Acumulado moneda"
#. module: account_financial_report #. module: account_financial_report
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0 #: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
#: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines
@ -517,7 +522,6 @@ msgstr "Saldo Acumu."
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0 #: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
#: code:addons/account_financial_report/report/open_items_xlsx.py:0 #: code:addons/account_financial_report/report/open_items_xlsx.py:0
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:0 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:0
#: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines
#: model_terms:ir.ui.view,arch_db:account_financial_report.report_journal_ledger_journal_table_header #: model_terms:ir.ui.view,arch_db:account_financial_report.report_journal_ledger_journal_table_header
#: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines_header #: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines_header
#: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_lines_header #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_lines_header
@ -1864,104 +1868,3 @@ msgstr "ancho: 38.92%;"
#: model_terms:ir.ui.view,arch_db:account_financial_report.report_journal_ledger_journal_table_header #: model_terms:ir.ui.view,arch_db:account_financial_report.report_journal_ledger_journal_table_header
msgid "width: 8.11%;" msgid "width: 8.11%;"
msgstr "ancho: 8.11%;" msgstr "ancho: 8.11%;"
#~ msgid "<span class=\"fa fa-download\"/> Export"
#~ msgstr "<span class=\"fa fa-download\"/>Exportar"
#~ msgid "<span class=\"fa fa-print\"/> Print"
#~ msgstr "<span class=\"fa fa-print\"/>Imprimir"
#~ msgid ""
#~ "Cost\n"
#~ " center"
#~ msgstr "Centro de Costos"
#~ msgid "Cost center"
#~ msgstr "Centro de Costos"
#~ msgid "Account Code"
#~ msgstr "Cuenta"
#~ msgid "Account ID"
#~ msgstr "Nº Cuenta"
#~ msgid "Account Type"
#~ msgstr "Tipo de Cuenta"
#~ msgid "Age 120 Days"
#~ msgstr "120 días"
#~ msgid "Age 30 Days"
#~ msgstr "30 días"
#~ msgid "Age 60 Days"
#~ msgstr "60 días"
#~ msgid "Age 90 Days"
#~ msgstr "90 días"
#~ msgid "Amount Residual"
#~ msgstr "Importe Inicial"
#~ msgid "Amount Residual Currency"
#~ msgstr "Moneda de Saldo Pendiente"
#~ msgid "Amount Total Due"
#~ msgstr "Total"
#~ msgid "Amount Total Due Currency"
#~ msgstr "Moneda de Total"
#~ msgid "Centralize"
#~ msgstr "Centralizar"
#~ msgid "Centralized Entries"
#~ msgstr "Centralizar las entradas"
#~ msgid "Child accounts"
#~ msgstr "Cuentas Hijas"
#~ msgid "Company Currency"
#~ msgstr "Moneda de Empresa"
#~ msgid "Cost Center"
#~ msgstr "Centro de Costos"
#~ msgid "Cumul Age 120 Days"
#~ msgstr "Acumulado a 120 días"
#~ msgid "Cumul Age 30 Days"
#~ msgstr "Acumulado a 30 días"
#~ msgid "Cumul Age 60 Days"
#~ msgstr "Acumulado a 60 días"
#~ msgid "Cumul Age 90 Days"
#~ msgstr "Acumulado a 90 días"
#~ msgid "Cumul Amount Residual"
#~ msgstr "Cantidad Residual Acumulada"
#~ msgid "Cumul Balance"
#~ msgstr "Saldo Acumulado"
#~ msgid "Cumul Current"
#~ msgstr "Acum. Actual"
#~ msgid "Cumul Older"
#~ msgstr "Acum. Anterior"
#~ msgid "Currency Name"
#~ msgstr "Moneda"
#~ msgid "Date Due"
#~ msgstr "Fecha vencimiento"
#~ msgid "Ending blance cur."
#~ msgstr "Saldo final."
#~ msgid "Filter Analytic Tag"
#~ msgstr "Filtrar por Etiqueta Analítica"
#~ msgid "Filter Cost Center"
#~ msgstr "Filtro Centro de Costos"

1
account_financial_report/readme/CONTRIBUTORS.rst
View File

@ -22,6 +22,7 @@
* Sergio Teruel * Sergio Teruel
* Ernesto Tejeda * Ernesto Tejeda
* Alexandre D. Díaz * Alexandre D. Díaz
* Víctor Martínez
* Lois Rilo <lois.rilo@forgeflow.com> * Lois Rilo <lois.rilo@forgeflow.com>
* `Sygel <https://www.sygel.es>`__: * `Sygel <https://www.sygel.es>`__:

11
account_financial_report/report/abstract_report_xlsx.py
View File

@ -458,16 +458,14 @@ class AbstractReportXslx(models.AbstractModel):
format_amt = self.format_amount format_amt = self.format_amount
field_prefix = "format_amount" field_prefix = "format_amount"
if "currency_id" in line_object and line_object.get("currency_id", False): if "currency_id" in line_object and line_object.get("currency_id", False):
field_name = "{}_{}".format(field_prefix, line_object["currency_id"].name) currency = line_object["currency_id"]
field_name = "{}_{}".format(field_prefix, currency.name)
if hasattr(self, field_name): if hasattr(self, field_name):
format_amt = getattr(self, field_name) format_amt = getattr(self, field_name)
else: else:
format_amt = self.workbook.add_format() format_amt = self.workbook.add_format()
self.field_name = format_amt self.field_name = format_amt
format_amount = "#,##0." + ( format_amt.set_num_format(self._report_xlsx_currency_format(currency))
"0" * line_object["currency_id"].decimal_places
)
format_amt.set_num_format(format_amount)
return format_amt return format_amt
def _get_currency_amt_format_dict(self, line_dict): def _get_currency_amt_format_dict(self, line_dict):
@ -489,8 +487,7 @@ class AbstractReportXslx(models.AbstractModel):
else: else:
format_amt = self.workbook.add_format() format_amt = self.workbook.add_format()
self.field_name = format_amt self.field_name = format_amt
format_amount = "#,##0." + ("0" * currency.decimal_places) format_amt.set_num_format(self._report_xlsx_currency_format(currency))
format_amt.set_num_format(format_amount)
return format_amt return format_amt
def _get_currency_amt_header_format(self, line_object): def _get_currency_amt_header_format(self, line_object):

1
account_financial_report/report/general_ledger.py
View File

@ -855,4 +855,5 @@ class GeneralLedgerReport(models.AbstractModel):
"centralize": centralize, "centralize": centralize,
"tags_data": tags_data, "tags_data": tags_data,
"filter_partner_ids": filter_partner_ids, "filter_partner_ids": filter_partner_ids,
"currency_model": self.env["res.currency"],
} }

28
account_financial_report/report/general_ledger_xlsx.py
View File

@ -1,6 +1,7 @@
# Author: Damien Crier # Author: Damien Crier
# Author: Julien Coux # Author: Julien Coux
# Copyright 2016 Camptocamp SA # Copyright 2016 Camptocamp SA
# Copyright 2022 Tecnativa - Víctor Martínez
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from odoo import _, models from odoo import _, models
@ -71,20 +72,19 @@ class GeneralLedgerXslx(models.AbstractModel):
] ]
if report.foreign_currency: if report.foreign_currency:
res += [ res += [
{
"header": _("Cur."),
"field": "currency_name",
"field_currency_balance": "currency_name",
"type": "currency_name",
"width": 7,
},
{ {
"header": _("Amount cur."), "header": _("Amount cur."),
"field": "bal_curr", "field": "bal_curr",
"field_initial_balance": "initial_bal_curr", "field_initial_balance": "initial_bal_curr",
"field_final_balance": "final_bal_curr", "field_final_balance": "final_bal_curr",
"type": "amount_currency", "type": "amount_currency",
"width": 14, "width": 10,
},
{
"header": _("Cumul cur."),
"field": "total_bal_curr",
"type": "amount_currency",
"width": 10,
}, },
] ]
res_as_dict = {} res_as_dict = {}
@ -173,6 +173,7 @@ class GeneralLedgerXslx(models.AbstractModel):
self.write_initial_balance_from_dict(account) self.write_initial_balance_from_dict(account)
# Display account move lines # Display account move lines
total_bal_curr = 0
for line in account["move_lines"]: for line in account["move_lines"]:
line.update( line.update(
{ {
@ -197,6 +198,9 @@ class GeneralLedgerXslx(models.AbstractModel):
line.update( line.update(
{"taxes_description": taxes_description, "tags": tags,} {"taxes_description": taxes_description, "tags": tags,}
) )
if foreign_currency and line["currency_id"]:
total_bal_curr += line["bal_curr"]
line.update({"total_bal_curr": total_bal_curr})
self.write_line_from_dict(line) self.write_line_from_dict(line)
# Display ending balance line for account # Display ending balance line for account
account.update( account.update(
@ -233,12 +237,13 @@ class GeneralLedgerXslx(models.AbstractModel):
} }
) )
if foreign_currency: if foreign_currency:
partner.update( account.update(
{"initial_bal_curr": partner["init_bal"]["bal_curr"],} {"initial_bal_curr": account["init_bal"]["bal_curr"]}
) )
self.write_initial_balance_from_dict(partner) self.write_initial_balance_from_dict(partner)
# Display account move lines # Display account move lines
total_bal_curr = 0
for line in partner["move_lines"]: for line in partner["move_lines"]:
line.update( line.update(
{ {
@ -265,6 +270,9 @@ class GeneralLedgerXslx(models.AbstractModel):
line.update( line.update(
{"taxes_description": taxes_description, "tags": tags,} {"taxes_description": taxes_description, "tags": tags,}
) )
if foreign_currency and line["currency_id"]:
total_bal_curr += line["bal_curr"]
line.update({"total_bal_curr": total_bal_curr})
self.write_line_from_dict(line) self.write_line_from_dict(line)
# Display ending balance line for partner # Display ending balance line for partner

70
account_financial_report/report/templates/general_ledger.xml
View File

@ -181,13 +181,16 @@
style="width: 8.02%;" style="width: 8.02%;"
>Cumul. Bal.</div> >Cumul. Bal.</div>
<t t-if="foreign_currency"> <t t-if="foreign_currency">
<!--## currency_name-->
<div class="act_as_cell" style="width: 2.08%;">Cur.</div>
<!--## amount_currency--> <!--## amount_currency-->
<div <div
class="act_as_cell amount" class="act_as_cell amount"
style="width: 5.19%;" style="width: 3.63%;"
>Amount cur.</div> >Amount cur.</div>
<!--## amount_currency cumulated-->
<div
class="act_as_cell amount"
style="width: 3.63%;"
>Cumul cur.</div>
</t> </t>
</div> </div>
</div> </div>
@ -315,12 +318,7 @@
<t <t
t-if="o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')" t-if="o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')"
> >
<div class="act_as_cell amount" style="width: 2.08%;"> <div class="act_as_cell amount" style="width: 3.63%;">
<span
t-esc="o._get_atr_from_dict(account['id'], accounts_data, 'currency_name')"
/>
</div>
<div class="act_as_cell amount" style="width: 5.19%;">
<t t-if="type == 'account_type'"> <t t-if="type == 'account_type'">
<t <t
t-set="domain" t-set="domain"
@ -355,16 +353,18 @@
</span> </span>
</t> </t>
</div> </div>
<div class="act_as_cell amount" style="width: 3.63%;" />
</t> </t>
<t <t
t-if="not o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')" t-if="not o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')"
> >
<div class="act_as_cell" style="width: 2.08%;" /> <div class="act_as_cell" style="width: 3.63%;" />
<div class="act_as_cell" style="width: 5.19%;" /> <div class="act_as_cell" style="width: 3.63%;" />
</t> </t>
</t> </t>
</div> </div>
<!-- Display each lines --> <!-- Display each lines -->
<t t-set="total_bal_curr" t-value="0" />
<t t-foreach="account_or_partner_object['move_lines']" t-as="line"> <t t-foreach="account_or_partner_object['move_lines']" t-as="line">
<!-- # lines or centralized lines --> <!-- # lines or centralized lines -->
<div class="act_as_row lines"> <div class="act_as_row lines">
@ -577,26 +577,40 @@
</div> </div>
<t t-if="foreign_currency"> <t t-if="foreign_currency">
<t t-if="line['currency_id']"> <t t-if="line['currency_id']">
<!--## currency_name--> <t
<div class="act_as_cell amount" style="width: 2.08%;"> t-set="line_currency"
<span t-esc="line['currency_id'][1]" /> t-value="currency_model.browse(line['currency_id'][0])"
</div> />
<t
t-set="total_bal_curr"
t-value="total_bal_curr + line['bal_curr']"
/>
<!--## amount_currency--> <!--## amount_currency-->
<div class="act_as_cell amount" style="width: 5.19%;"> <div class="act_as_cell amount" style="width: 3.63%;">
<span <span
t-att-res-id="line['id']" t-att-res-id="line['id']"
res-model="account.move.line" res-model="account.move.line"
view-type="form" view-type="form"
> t-raw="line['bal_curr']"
<t t-raw="line['bal_curr']" /> t-options="{'widget': 'monetary', 'display_currency': line_currency}"
</span> />
</div>
<!--## amount_currency cumulated-->
<div class="act_as_cell amount" style="width: 3.63%;">
<span
t-att-res-id="line['id']"
res-model="account.move.line"
view-type="form"
t-raw="total_bal_curr"
t-options="{'widget': 'monetary', 'display_currency': line_currency}"
/>
</div> </div>
</t> </t>
<t t-if="not line['currency_id']"> <t t-if="not line['currency_id']">
<!--## currency_name-->
<div class="act_as_cell amount" style="width: 2.08%;" />
<!--## amount_currency--> <!--## amount_currency-->
<div class="act_as_cell amount" style="width: 5.19%;" /> <div class="act_as_cell amount" style="width: 3.63%;" />
<!--## amount_currency cumulated-->
<div class="act_as_cell amount" style="width: 3.63%;" />
</t> </t>
</t> </t>
</div> </div>
@ -662,12 +676,7 @@
<t <t
t-if="o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')" t-if="o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')"
> >
<div class="act_as_cell amount" style="width: 2.08%;"> <div class="act_as_cell amount" style="width: 3.63%;">
<span
t-esc="o._get_atr_from_dict(account['id'], accounts_data, 'currency_name')"
/>
</div>
<div class="act_as_cell amount" style="width: 5.19%;">
<t t-if="type == 'account_type'"> <t t-if="type == 'account_type'">
<t <t
t-set="domain" t-set="domain"
@ -710,12 +719,13 @@
</span> </span>
</t> </t>
</div> </div>
<div class="act_as_cell amount" style="width: 3.63%;" />
</t> </t>
<t <t
t-if="not o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')" t-if="not o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')"
> >
<div class="act_as_cell amount" style="width: 2.08%;" /> <div class="act_as_cell amount" style="width: 3.63%;" />
<div class="act_as_cell amount" style="width: 5.19%;" /> <div class="act_as_cell amount" style="width: 3.63%;" />
</t> </t>
</t> </t>
</div> </div>

3
account_financial_report/static/description/index.html
View File

@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" /> <meta name="generator" content="Docutils: http://docutils.sourceforge.net/" />
<title>Account Financial Reports</title> <title>Account Financial Reports</title>
<style type="text/css"> <style type="text/css">
@ -484,6 +484,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
<li>Sergio Teruel</li> <li>Sergio Teruel</li>
<li>Ernesto Tejeda</li> <li>Ernesto Tejeda</li>
<li>Alexandre D. Díaz</li> <li>Alexandre D. Díaz</li>
<li>Víctor Martínez</li>
</ul> </ul>
</li> </li>
<li>Lois Rilo &lt;<a class="reference external" href="mailto:lois.rilo&#64;forgeflow.com">lois.rilo&#64;forgeflow.com</a>&gt;</li> <li>Lois Rilo &lt;<a class="reference external" href="mailto:lois.rilo&#64;forgeflow.com">lois.rilo&#64;forgeflow.com</a>&gt;</li>