[IMP] account_financial_report: pre-commit auto fixes
This commit is contained in:
chaule97
@@ -17,13 +17,13 @@ Account Financial Reports
|
||||
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
|
||||
:alt: License: AGPL-3
|
||||
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--financial--reporting-lightgray.png?logo=github
|
||||
:target: https://github.com/OCA/account-financial-reporting/tree/17.0/account_financial_report
|
||||
:target: https://github.com/OCA/account-financial-reporting/tree/18.0/account_financial_report
|
||||
:alt: OCA/account-financial-reporting
|
||||
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
|
||||
:target: https://translation.odoo-community.org/projects/account-financial-reporting-17-0/account-financial-reporting-17-0-account_financial_report
|
||||
:target: https://translation.odoo-community.org/projects/account-financial-reporting-18-0/account-financial-reporting-18-0-account_financial_report
|
||||
:alt: Translate me on Weblate
|
||||
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
|
||||
:target: https://runboat.odoo-community.org/builds?repo=OCA/account-financial-reporting&target_branch=17.0
|
||||
:target: https://runboat.odoo-community.org/builds?repo=OCA/account-financial-reporting&target_branch=18.0
|
||||
:alt: Try me on Runboat
|
||||
|
||||
|badge1| |badge2| |badge3| |badge4| |badge5|
|
||||
@@ -31,12 +31,12 @@ Account Financial Reports
|
||||
This module adds a set of financial reports. They are accessible under
|
||||
Invoicing / Reporting / OCA accounting reports.
|
||||
|
||||
- General ledger
|
||||
- Trial Balance
|
||||
- Open Items
|
||||
- Aged Partner Balance
|
||||
- VAT Report
|
||||
- Journal Ledger
|
||||
- General ledger
|
||||
- Trial Balance
|
||||
- Open Items
|
||||
- Aged Partner Balance
|
||||
- VAT Report
|
||||
- Journal Ledger
|
||||
|
||||
Currently General ledger, Trial Balance and Open Items are fully
|
||||
compatible with a foreign currency set up in account in order to display
|
||||
@@ -90,12 +90,12 @@ per company in:
|
||||
Known issues / Roadmap
|
||||
======================
|
||||
|
||||
- 'VAT Report' is valid only for cases where it's met that for each Tax
|
||||
defined: all the "Account tags" of all the 'Repartition for Invoices'
|
||||
or 'Repartition for Credit Notes' are different.
|
||||
- It would be nice to have in reports a column indicating the state of
|
||||
the entries when the option "All Entries" is selected in "Target
|
||||
Moves" field in a wizard
|
||||
- 'VAT Report' is valid only for cases where it's met that for each Tax
|
||||
defined: all the "Account tags" of all the 'Repartition for Invoices'
|
||||
or 'Repartition for Credit Notes' are different.
|
||||
- It would be nice to have in reports a column indicating the state of
|
||||
the entries when the option "All Entries" is selected in "Target
|
||||
Moves" field in a wizard
|
||||
|
||||
Changelog
|
||||
=========
|
||||
@@ -103,22 +103,22 @@ Changelog
|
||||
11.0.2.5.0 (2019-04-26)
|
||||
-----------------------
|
||||
|
||||
- In the Trial Balance you have an option to hide parent hierarchy
|
||||
levels
|
||||
- In the Trial Balance you have an option to hide parent hierarchy
|
||||
levels
|
||||
|
||||
11.0.2.4.1 (2019-01-08)
|
||||
-----------------------
|
||||
|
||||
- Handle better multicompany behaviour
|
||||
- Improve how title appears in the reports
|
||||
- Improve performance in General Ledger
|
||||
- Handle better multicompany behaviour
|
||||
- Improve how title appears in the reports
|
||||
- Improve performance in General Ledger
|
||||
|
||||
11.0.2.3.1 (2018-11-29)
|
||||
-----------------------
|
||||
|
||||
- In the Trial Balance you can apply a filter by hierarchy levels
|
||||
- In the General Ledger you can apply a filter by Analytic Tag
|
||||
- In the Journal Ledger the field 'Journal' is now optional
|
||||
- In the Trial Balance you can apply a filter by hierarchy levels
|
||||
- In the General Ledger you can apply a filter by Analytic Tag
|
||||
- In the Journal Ledger the field 'Journal' is now optional
|
||||
|
||||
Bug Tracker
|
||||
===========
|
||||
@@ -126,7 +126,7 @@ Bug Tracker
|
||||
Bugs are tracked on `GitHub Issues <https://github.com/OCA/account-financial-reporting/issues>`_.
|
||||
In case of trouble, please check there if your issue has already been reported.
|
||||
If you spotted it first, help us to smash it by providing a detailed and welcomed
|
||||
`feedback <https://github.com/OCA/account-financial-reporting/issues/new?body=module:%20account_financial_report%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
|
||||
`feedback <https://github.com/OCA/account-financial-reporting/issues/new?body=module:%20account_financial_report%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
|
||||
|
||||
Do not contact contributors directly about support or help with technical issues.
|
||||
|
||||
@@ -144,42 +144,42 @@ Authors
|
||||
Contributors
|
||||
------------
|
||||
|
||||
- Jordi Ballester <jordi.ballester@forgeflow.com>
|
||||
- Yannick Vaucher <yannick.vaucher@camptocamp.com>
|
||||
- Simone Orsi <simone.orsi@abstract.com>
|
||||
- Leonardo Pistone <leonardo.pistone@camptocamp.com>
|
||||
- Damien Crier <damien.crier@camptocamp.com>
|
||||
- Andrea Stirpe <a.stirpe@onestein.nl>
|
||||
- Thomas Rehn <thomas.rehn@initos.com>
|
||||
- Andrea Gallina <4everamd@gmail.com>
|
||||
- Robert Rottermann <robert@redcor.ch>
|
||||
- Ciro Urselli <c.urselli@apuliasoftware.it>
|
||||
- Francesco Apruzzese <opencode@e-ware.org>
|
||||
- Lorenzo Battistini <https://github.com/eLBati>
|
||||
- Julien Coux <julien.coux@camptocamp.com>
|
||||
- Akim Juillerat <akim.juillerat@camptocamp.com>
|
||||
- Alexis de Lattre <alexis@via.ecp.fr>
|
||||
- Mihai Fekete <feketemihai@gmail.com>
|
||||
- Miquel Ra??ch <miquel.raich@forgeflow.com>
|
||||
- Joan Sisquella <joan.sisquella@forgeflow.com>
|
||||
- `Tecnativa <https://www.tecnativa.com>`__:
|
||||
- Jordi Ballester <jordi.ballester@forgeflow.com>
|
||||
- Yannick Vaucher <yannick.vaucher@camptocamp.com>
|
||||
- Simone Orsi <simone.orsi@abstract.com>
|
||||
- Leonardo Pistone <leonardo.pistone@camptocamp.com>
|
||||
- Damien Crier <damien.crier@camptocamp.com>
|
||||
- Andrea Stirpe <a.stirpe@onestein.nl>
|
||||
- Thomas Rehn <thomas.rehn@initos.com>
|
||||
- Andrea Gallina <4everamd@gmail.com>
|
||||
- Robert Rottermann <robert@redcor.ch>
|
||||
- Ciro Urselli <c.urselli@apuliasoftware.it>
|
||||
- Francesco Apruzzese <opencode@e-ware.org>
|
||||
- Lorenzo Battistini <https://github.com/eLBati>
|
||||
- Julien Coux <julien.coux@camptocamp.com>
|
||||
- Akim Juillerat <akim.juillerat@camptocamp.com>
|
||||
- Alexis de Lattre <alexis@via.ecp.fr>
|
||||
- Mihai Fekete <feketemihai@gmail.com>
|
||||
- Miquel Ra??ch <miquel.raich@forgeflow.com>
|
||||
- Joan Sisquella <joan.sisquella@forgeflow.com>
|
||||
- `Tecnativa <https://www.tecnativa.com>`__:
|
||||
|
||||
- Pedro M. Baeza
|
||||
- Sergio Teruel
|
||||
- Ernesto Tejeda
|
||||
- Jo??o Marques
|
||||
- Alexandre D. D??az
|
||||
- V??ctor Mart??nez
|
||||
- Carolina Fernandez
|
||||
- Pedro M. Baeza
|
||||
- Sergio Teruel
|
||||
- Ernesto Tejeda
|
||||
- Jo??o Marques
|
||||
- Alexandre D. D??az
|
||||
- V??ctor Mart??nez
|
||||
- Carolina Fernandez
|
||||
|
||||
- `Sygel <https://www.sygel.es>`__:
|
||||
- `Sygel <https://www.sygel.es>`__:
|
||||
|
||||
- Harald Panten
|
||||
- Valentin Vinagre
|
||||
- Harald Panten
|
||||
- Valentin Vinagre
|
||||
|
||||
- Lois Rilo <lois.rilo@forgeflow.com>
|
||||
- Saran Lim. <saranl@ecosoft.co.th>
|
||||
- Omar Casti??eira <omar@comunitea.com>
|
||||
- Lois Rilo <lois.rilo@forgeflow.com>
|
||||
- Saran Lim. <saranl@ecosoft.co.th>
|
||||
- Omar Casti??eira <omar@comunitea.com>
|
||||
|
||||
Much of the work in this module was done at a sprint in Sorrento, Italy
|
||||
in April 2016.
|
||||
@@ -197,6 +197,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
|
||||
mission is to support the collaborative development of Odoo features and
|
||||
promote its widespread use.
|
||||
|
||||
This module is part of the `OCA/account-financial-reporting <https://github.com/OCA/account-financial-reporting/tree/17.0/account_financial_report>`_ project on GitHub.
|
||||
This module is part of the `OCA/account-financial-reporting <https://github.com/OCA/account-financial-reporting/tree/18.0/account_financial_report>`_ project on GitHub.
|
||||
|
||||
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
|
||||
|
||||
@@ -42,8 +42,8 @@ class AccountGroup(models.Model):
|
||||
"""Forms complete code of location from parent location to child location."""
|
||||
for group in self:
|
||||
if group.parent_id.complete_code:
|
||||
group.complete_code = "{}/{}".format(
|
||||
group.parent_id.complete_code, group.code_prefix_start
|
||||
group.complete_code = (
|
||||
f"{group.parent_id.complete_code}/{group.code_prefix_start}"
|
||||
)
|
||||
else:
|
||||
group.complete_code = group.code_prefix_start
|
||||
|
||||
@@ -610,8 +610,8 @@ class AbstractReportXslx(models.AbstractModel):
|
||||
|
||||
def _get_report_complete_name(self, report, prefix, data=None):
|
||||
if report.company_id:
|
||||
suffix = " - {} - {}".format(
|
||||
report.company_id.name, report.company_id.currency_id.name
|
||||
suffix = (
|
||||
f" - {report.company_id.name} - {report.company_id.currency_id.name}"
|
||||
)
|
||||
return prefix + suffix
|
||||
return prefix
|
||||
|
||||
@@ -517,9 +517,9 @@ class GeneralLedgerReport(models.AbstractModel):
|
||||
"balance"
|
||||
]
|
||||
if foreign_currency:
|
||||
gen_ld_data[acc_id][item_id]["fin_bal"][
|
||||
"bal_curr"
|
||||
] += move_line["amount_currency"]
|
||||
gen_ld_data[acc_id][item_id]["fin_bal"]["bal_curr"] += (
|
||||
move_line["amount_currency"]
|
||||
)
|
||||
else:
|
||||
gen_ld_data[acc_id][ml_id] = self._get_move_line_data(move_line)
|
||||
gen_ld_data[acc_id]["fin_bal"]["credit"] += move_line["credit"]
|
||||
|
||||
@@ -93,9 +93,9 @@ class JournalLedgerReport(models.AbstractModel):
|
||||
return "move_id"
|
||||
|
||||
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
|
||||
base_debit = base_credit = tax_debit = tax_credit = base_balance = (
|
||||
tax_balance
|
||||
) = 0.0
|
||||
if exigible:
|
||||
base_debit = ml_taxes and ml.debit or 0.0
|
||||
base_credit = ml_taxes and ml.credit or 0.0
|
||||
@@ -312,11 +312,9 @@ class JournalLedgerReport(models.AbstractModel):
|
||||
if key not in journal_moves_data.keys():
|
||||
journal_moves_data[key] = []
|
||||
journal_moves_data[key] += list(items)
|
||||
move_lines_data = (
|
||||
account_ids_data
|
||||
) = (
|
||||
partner_ids_data
|
||||
) = currency_ids_data = tax_line_ids_data = move_line_ids_taxes_data = {}
|
||||
move_lines_data = account_ids_data = partner_ids_data = currency_ids_data = (
|
||||
tax_line_ids_data
|
||||
) = move_line_ids_taxes_data = {}
|
||||
if move_ids:
|
||||
move_lines = self._get_move_lines(move_ids, wizard, journal_ids)
|
||||
move_lines_data = move_lines[1]
|
||||
|
||||
@@ -130,7 +130,9 @@
|
||||
</t>
|
||||
<!--## dynamic columns-->
|
||||
<t t-foreach="age_partner_config.line_ids" t-as="column_dynamic">
|
||||
<div class="act_as_cell"><span t-out="column_dynamic.name" /></div>
|
||||
<div class="act_as_cell">
|
||||
<span t-out="column_dynamic.name" />
|
||||
</div>
|
||||
</t>
|
||||
</div>
|
||||
</div>
|
||||
@@ -149,9 +151,9 @@
|
||||
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
|
||||
/>
|
||||
</div>
|
||||
<!--## current-->
|
||||
<!--## current-->
|
||||
<div class="act_as_cell amount">
|
||||
<span
|
||||
<span
|
||||
t-esc="partner['current']"
|
||||
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
|
||||
/>
|
||||
@@ -357,26 +359,26 @@
|
||||
/>
|
||||
</span>
|
||||
</div>
|
||||
<!--## current-->
|
||||
<div class="act_as_cell amount">
|
||||
<t t-if="line['current'] == 0">
|
||||
<span
|
||||
<!--## current-->
|
||||
<div class="act_as_cell amount">
|
||||
<t t-if="line['current'] == 0">
|
||||
<span
|
||||
t-esc="line['current']"
|
||||
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
|
||||
/>
|
||||
</t>
|
||||
<t t-else="">
|
||||
<span
|
||||
</t>
|
||||
<t t-else="">
|
||||
<span
|
||||
domain="[('id', 'in', (line['line_rec'] | line['line_rec'].matched_debit_ids.mapped('debit_move_id') | line['line_rec'].matched_credit_ids.mapped('credit_move_id')).ids)]"
|
||||
res-model="account.move.line"
|
||||
>
|
||||
<t
|
||||
<t
|
||||
t-out="line['current']"
|
||||
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
|
||||
/>
|
||||
</span>
|
||||
</t>
|
||||
</div>
|
||||
</span>
|
||||
</t>
|
||||
</div>
|
||||
<t t-if="not age_partner_config">
|
||||
<!--## age_30_days-->
|
||||
<div class="act_as_cell amount">
|
||||
@@ -522,13 +524,13 @@
|
||||
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
|
||||
/>
|
||||
</div>
|
||||
<!--## current-->
|
||||
<div class="act_as_cell amount" style="width: 6.00%;">
|
||||
<span
|
||||
<!--## current-->
|
||||
<div class="act_as_cell amount" style="width: 6.00%;">
|
||||
<span
|
||||
t-esc="partner_cumul_line['current']"
|
||||
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<t t-if="not age_partner_config">
|
||||
<!--## age_30_days-->
|
||||
<div class="act_as_cell amount" style="width: 6.00%;">
|
||||
@@ -591,13 +593,13 @@
|
||||
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
|
||||
/>
|
||||
</div>
|
||||
<!--## current-->
|
||||
<div class="act_as_cell amount" style="width: 9.64%;">
|
||||
<span
|
||||
<!--## current-->
|
||||
<div class="act_as_cell amount" style="width: 9.64%;">
|
||||
<span
|
||||
t-esc="account['current']"
|
||||
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<t t-if="not age_partner_config">
|
||||
<!--## age_30_days-->
|
||||
<div class="act_as_cell amount" style="width: 9.64%;">
|
||||
@@ -656,13 +658,13 @@
|
||||
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
|
||||
/>
|
||||
</div>
|
||||
<!--## current-->
|
||||
<div class="act_as_cell amount" style="width: 6.00%">
|
||||
<span
|
||||
<!--## current-->
|
||||
<div class="act_as_cell amount" style="width: 6.00%">
|
||||
<span
|
||||
t-esc="account['current']"
|
||||
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<t t-if="not age_partner_config">
|
||||
<!--## age_30_days-->
|
||||
<div class="act_as_cell amount" style="width: 6.00%">
|
||||
@@ -802,7 +804,7 @@
|
||||
%
|
||||
</div>
|
||||
</t>
|
||||
</t>
|
||||
</t>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -492,8 +492,8 @@
|
||||
t-if="int(line['analytic_distribution'][analytic_id]) < 100"
|
||||
>
|
||||
<t
|
||||
t-out="int(line['analytic_distribution'][analytic_id])"
|
||||
/>%
|
||||
t-out="int(line['analytic_distribution'][analytic_id])"
|
||||
/>%
|
||||
</t>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
@@ -105,7 +105,7 @@
|
||||
</t>
|
||||
</t>
|
||||
<t t-else="">
|
||||
<t t-if="not with_auto_sequence">
|
||||
<t t-if="not with_auto_sequence">
|
||||
<t t-set="account_column_style">
|
||||
width: 23.78%;
|
||||
</t>
|
||||
@@ -198,12 +198,8 @@
|
||||
</b>
|
||||
</div>
|
||||
<t t-if="display_currency">
|
||||
<div class="act_as_cell" name="currency_name">
|
||||
|
||||
</div>
|
||||
<div class="act_as_cell amount" name="amount_currency">
|
||||
|
||||
</div>
|
||||
<div class="act_as_cell" name="currency_name" />
|
||||
<div class="act_as_cell amount" name="amount_currency" />
|
||||
</t>
|
||||
</div>
|
||||
<div style="width: 100%" />
|
||||
@@ -256,8 +252,8 @@
|
||||
<span t-if="display_account_name">
|
||||
-
|
||||
<span
|
||||
t-esc="o._get_atr_from_dict(move_line['account_id'], account_ids_data, 'name')"
|
||||
/>
|
||||
t-esc="o._get_atr_from_dict(move_line['account_id'], account_ids_data, 'name')"
|
||||
/>
|
||||
</span>
|
||||
</div>
|
||||
<div class="act_as_cell left" name="partner">
|
||||
@@ -443,77 +439,73 @@
|
||||
<div class="act_as_table data_table" style="width: 100%;">
|
||||
10
|
||||
<div class="act_as_row labels">
|
||||
<div
|
||||
class="act_as_cell first_column"
|
||||
name="name"
|
||||
style="width: 30.97%;"
|
||||
/>
|
||||
<div class="act_as_cell" name="description" style="width: 13.27%;" />
|
||||
<div class="act_as_cell" name="base_debit" style="width: 9.29%;">
|
||||
<div class="act_as_cell first_column" name="name" style="width: 30.97%;" />
|
||||
<div class="act_as_cell" name="description" style="width: 13.27%;" />
|
||||
<div class="act_as_cell" name="base_debit" style="width: 9.29%;">
|
||||
Debit
|
||||
</div>
|
||||
<div class="act_as_cell" name="base_credit" style="width: 9.29%;">
|
||||
<div class="act_as_cell" name="base_credit" style="width: 9.29%;">
|
||||
Credit
|
||||
</div>
|
||||
<div class="act_as_cell" name="base_balance" style="width: 9.29%;">
|
||||
<div class="act_as_cell" name="base_balance" style="width: 9.29%;">
|
||||
Balance
|
||||
</div>
|
||||
<div class="act_as_cell" name="tax_debit" style="width: 9.29%;">
|
||||
<div class="act_as_cell" name="tax_debit" style="width: 9.29%;">
|
||||
Debit
|
||||
</div>
|
||||
<div class="act_as_cell" name="tax_credit" style="width: 9.29%;">
|
||||
<div class="act_as_cell" name="tax_credit" style="width: 9.29%;">
|
||||
Credit
|
||||
</div>
|
||||
<div class="act_as_cell" name="tax_balance" style="width: 9.29%;">
|
||||
<div class="act_as_cell" name="tax_balance" style="width: 9.29%;">
|
||||
Balance
|
||||
</div>
|
||||
</div>
|
||||
<t t-foreach="ReportTaxLines" t-as="tax_line">
|
||||
<div class="act_as_row lines">
|
||||
<div class="act_as_cell left" name="tax_name">
|
||||
<span t-esc="tax_line['tax_name']" />
|
||||
</div>
|
||||
<div class="act_as_cell left" name="tax_code">
|
||||
<span t-esc="tax_line['tax_code']" />
|
||||
</div>
|
||||
<div class="act_as_cell amount" name="base_debit">
|
||||
<span
|
||||
t-esc="tax_line['base_debit']"
|
||||
t-options="{'widget': 'float', 'precision': 2}"
|
||||
/>
|
||||
</div>
|
||||
<div class="act_as_cell amount" name="base_credit">
|
||||
<span
|
||||
t-esc="tax_line['base_credit']"
|
||||
t-options="{'widget': 'float', 'precision': 2}"
|
||||
/>
|
||||
</div>
|
||||
<div class="act_as_cell amount" name="base_balance">
|
||||
<span
|
||||
t-esc="tax_line['base_balance']"
|
||||
t-options="{'widget': 'float', 'precision': 2}"
|
||||
/>
|
||||
</div>
|
||||
<div class="act_as_cell amount" name="tax_debit">
|
||||
<span
|
||||
t-esc="tax_line['tax_debit']"
|
||||
t-options="{'widget': 'float', 'precision': 2}"
|
||||
/>
|
||||
</div>
|
||||
<div class="act_as_cell amount" name="tax_credit">
|
||||
<span
|
||||
t-esc="tax_line['tax_credit']"
|
||||
t-options="{'widget': 'float', 'precision': 2}"
|
||||
/>
|
||||
</div>
|
||||
<div class="act_as_cell amount" name="tax_balance">
|
||||
<span
|
||||
t-esc="tax_line['tax_balance']"
|
||||
t-options="{'widget': 'float', 'precision': 2}"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<t t-foreach="ReportTaxLines" t-as="tax_line">
|
||||
<div class="act_as_row lines">
|
||||
<div class="act_as_cell left" name="tax_name">
|
||||
<span t-esc="tax_line['tax_name']" />
|
||||
</div>
|
||||
<div class="act_as_cell left" name="tax_code">
|
||||
<span t-esc="tax_line['tax_code']" />
|
||||
</div>
|
||||
<div class="act_as_cell amount" name="base_debit">
|
||||
<span
|
||||
t-esc="tax_line['base_debit']"
|
||||
t-options="{'widget': 'float', 'precision': 2}"
|
||||
/>
|
||||
</div>
|
||||
<div class="act_as_cell amount" name="base_credit">
|
||||
<span
|
||||
t-esc="tax_line['base_credit']"
|
||||
t-options="{'widget': 'float', 'precision': 2}"
|
||||
/>
|
||||
</div>
|
||||
<div class="act_as_cell amount" name="base_balance">
|
||||
<span
|
||||
t-esc="tax_line['base_balance']"
|
||||
t-options="{'widget': 'float', 'precision': 2}"
|
||||
/>
|
||||
</div>
|
||||
<div class="act_as_cell amount" name="tax_debit">
|
||||
<span
|
||||
t-esc="tax_line['tax_debit']"
|
||||
t-options="{'widget': 'float', 'precision': 2}"
|
||||
/>
|
||||
</div>
|
||||
<div class="act_as_cell amount" name="tax_credit">
|
||||
<span
|
||||
t-esc="tax_line['tax_credit']"
|
||||
t-options="{'widget': 'float', 'precision': 2}"
|
||||
/>
|
||||
</div>
|
||||
<div class="act_as_cell amount" name="tax_balance">
|
||||
<span
|
||||
t-esc="tax_line['tax_balance']"
|
||||
t-options="{'widget': 'float', 'precision': 2}"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</t>
|
||||
</t>
|
||||
</div>
|
||||
</template>
|
||||
</odoo>
|
||||
|
||||
@@ -98,9 +98,7 @@
|
||||
<t t-set="style" t-value="'font-size:12px;'" />
|
||||
<!-- Different style for account group -->
|
||||
<t t-if="show_hierarchy">
|
||||
<t
|
||||
t-if="balance['type'] == 'group_type'"
|
||||
>
|
||||
<t t-if="balance['type'] == 'group_type'">
|
||||
<t
|
||||
t-set="style"
|
||||
t-value="style + 'font-weight: bold; color: blue;'"
|
||||
@@ -143,8 +141,8 @@
|
||||
view-type="form"
|
||||
>
|
||||
<t
|
||||
t-out="accounts_data[account_id]['code']"
|
||||
/> - <t t-out="accounts_data[account_id]['name']" />
|
||||
t-out="accounts_data[account_id]['code']"
|
||||
/> - <t t-out="accounts_data[account_id]['name']" />
|
||||
</span>
|
||||
</div>
|
||||
<div class="act_as_table data_table" style="width: 100%;">
|
||||
|
||||
@@ -266,9 +266,9 @@ class TrialBalanceReport(models.AbstractModel):
|
||||
tb2 = tb["group_by_data"][gb_key]
|
||||
if "group_by_data" in total_amount[acc_id]:
|
||||
if gb_key not in total_amount[acc_id]["group_by_data"]:
|
||||
total_amount[acc_id]["group_by_data"][
|
||||
gb_key
|
||||
] = self._prepare_total_amount(tb2, foreign_currency)
|
||||
total_amount[acc_id]["group_by_data"][gb_key] = (
|
||||
self._prepare_total_amount(tb2, foreign_currency)
|
||||
)
|
||||
else:
|
||||
total_amount[acc_id]["group_by_data"][gb_key][
|
||||
"initial_balance"
|
||||
@@ -598,19 +598,19 @@ class TrialBalanceReport(models.AbstractModel):
|
||||
total_amount[unaffected_id]["ending_balance"] += pl_initial_balance
|
||||
total_amount[unaffected_id]["initial_balance"] += pl_initial_balance
|
||||
if foreign_currency:
|
||||
total_amount[unaffected_id][
|
||||
"ending_currency_balance"
|
||||
] += pl_initial_currency_balance
|
||||
total_amount[unaffected_id][
|
||||
"initial_currency_balance"
|
||||
] += pl_initial_currency_balance
|
||||
total_amount[unaffected_id]["ending_currency_balance"] += (
|
||||
pl_initial_currency_balance
|
||||
)
|
||||
total_amount[unaffected_id]["initial_currency_balance"] += (
|
||||
pl_initial_currency_balance
|
||||
)
|
||||
if grouped_by:
|
||||
total_amount[unaffected_id]["group_by_data"][0][
|
||||
"ending_balance"
|
||||
] = total_amount[unaffected_id]["ending_balance"]
|
||||
total_amount[unaffected_id]["group_by_data"][0][
|
||||
"initial_balance"
|
||||
] = total_amount[unaffected_id]["initial_balance"]
|
||||
total_amount[unaffected_id]["group_by_data"][0]["ending_balance"] = (
|
||||
total_amount[unaffected_id]["ending_balance"]
|
||||
)
|
||||
total_amount[unaffected_id]["group_by_data"][0]["initial_balance"] = (
|
||||
total_amount[unaffected_id]["initial_balance"]
|
||||
)
|
||||
if foreign_currency:
|
||||
total_amount[unaffected_id]["group_by_data"][0][
|
||||
"ending_currency_balance"
|
||||
@@ -833,12 +833,12 @@ class TrialBalanceReport(models.AbstractModel):
|
||||
"ending_balance"
|
||||
]
|
||||
if foreign_currency:
|
||||
groups_data[group_id][
|
||||
"initial_currency_balance"
|
||||
] += total_amount[acc_id]["initial_currency_balance"]
|
||||
groups_data[group_id][
|
||||
"ending_currency_balance"
|
||||
] += total_amount[acc_id]["ending_currency_balance"]
|
||||
groups_data[group_id]["initial_currency_balance"] += (
|
||||
total_amount[acc_id]["initial_currency_balance"]
|
||||
)
|
||||
groups_data[group_id]["ending_currency_balance"] += (
|
||||
total_amount[acc_id]["ending_currency_balance"]
|
||||
)
|
||||
return groups_data
|
||||
|
||||
def _get_report_values(self, docids, data):
|
||||
|
||||
@@ -369,7 +369,7 @@ ul.auto-toc {
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
!! source digest: sha256:4d56adc35fff26b88020bebb3cd0fcb302b7c7c7483639925cfc4f9b850d8ac4
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
|
||||
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/account-financial-reporting/tree/17.0/account_financial_report"><img alt="OCA/account-financial-reporting" src="https://img.shields.io/badge/github-OCA%2Faccount--financial--reporting-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/account-financial-reporting-17-0/account-financial-reporting-17-0-account_financial_report"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/account-financial-reporting&target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
|
||||
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/account-financial-reporting/tree/18.0/account_financial_report"><img alt="OCA/account-financial-reporting" src="https://img.shields.io/badge/github-OCA%2Faccount--financial--reporting-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/account-financial-reporting-18-0/account-financial-reporting-18-0-account_financial_report"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/account-financial-reporting&target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
|
||||
<p>This module adds a set of financial reports. They are accessible under
|
||||
Invoicing / Reporting / OCA accounting reports.</p>
|
||||
<ul class="simple">
|
||||
@@ -472,7 +472,7 @@ levels</li>
|
||||
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/account-financial-reporting/issues">GitHub Issues</a>.
|
||||
In case of trouble, please check there if your issue has already been reported.
|
||||
If you spotted it first, help us to smash it by providing a detailed and welcomed
|
||||
<a class="reference external" href="https://github.com/OCA/account-financial-reporting/issues/new?body=module:%20account_financial_report%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
|
||||
<a class="reference external" href="https://github.com/OCA/account-financial-reporting/issues/new?body=module:%20account_financial_report%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
|
||||
<p>Do not contact contributors directly about support or help with technical issues.</p>
|
||||
</div>
|
||||
<div class="section" id="credits">
|
||||
@@ -538,7 +538,7 @@ in April 2016.</p>
|
||||
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
|
||||
mission is to support the collaborative development of Odoo features and
|
||||
promote its widespread use.</p>
|
||||
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/account-financial-reporting/tree/17.0/account_financial_report">OCA/account-financial-reporting</a> project on GitHub.</p>
|
||||
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/account-financial-reporting/tree/18.0/account_financial_report">OCA/account-financial-reporting</a> project on GitHub.</p>
|
||||
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -105,24 +105,24 @@
|
||||
<footer>
|
||||
<div invisible="not only_one_unaffected_earnings_account">
|
||||
<button
|
||||
name="button_export_html"
|
||||
string="View"
|
||||
type="object"
|
||||
default_focus="1"
|
||||
class="oe_highlight"
|
||||
/>
|
||||
name="button_export_html"
|
||||
string="View"
|
||||
type="object"
|
||||
default_focus="1"
|
||||
class="oe_highlight"
|
||||
/>
|
||||
or
|
||||
<button
|
||||
name="button_export_pdf"
|
||||
string="Export PDF"
|
||||
type="object"
|
||||
/>
|
||||
name="button_export_pdf"
|
||||
string="Export PDF"
|
||||
type="object"
|
||||
/>
|
||||
or
|
||||
<button
|
||||
name="button_export_xlsx"
|
||||
string="Export XLSX"
|
||||
type="object"
|
||||
/>
|
||||
name="button_export_xlsx"
|
||||
string="Export XLSX"
|
||||
type="object"
|
||||
/>
|
||||
or
|
||||
<button string="Cancel" class="oe_link" special="cancel" />
|
||||
</div>
|
||||
|
||||
@@ -41,24 +41,24 @@
|
||||
</group>
|
||||
<footer>
|
||||
<button
|
||||
name="button_export_html"
|
||||
string="View"
|
||||
type="object"
|
||||
default_focus="1"
|
||||
class="oe_highlight"
|
||||
/>
|
||||
name="button_export_html"
|
||||
string="View"
|
||||
type="object"
|
||||
default_focus="1"
|
||||
class="oe_highlight"
|
||||
/>
|
||||
or
|
||||
<button
|
||||
name="button_export_pdf"
|
||||
string="Export PDF"
|
||||
type="object"
|
||||
/>
|
||||
name="button_export_pdf"
|
||||
string="Export PDF"
|
||||
type="object"
|
||||
/>
|
||||
or
|
||||
<button
|
||||
name="button_export_xlsx"
|
||||
string="Export XLSX"
|
||||
type="object"
|
||||
/>
|
||||
name="button_export_xlsx"
|
||||
string="Export XLSX"
|
||||
type="object"
|
||||
/>
|
||||
or
|
||||
<button string="Cancel" class="oe_link" special="cancel" />
|
||||
</footer>
|
||||
|
||||
@@ -63,24 +63,24 @@
|
||||
</group>
|
||||
<footer>
|
||||
<button
|
||||
name="button_export_html"
|
||||
string="View"
|
||||
type="object"
|
||||
default_focus="1"
|
||||
class="oe_highlight"
|
||||
/>
|
||||
name="button_export_html"
|
||||
string="View"
|
||||
type="object"
|
||||
default_focus="1"
|
||||
class="oe_highlight"
|
||||
/>
|
||||
or
|
||||
<button
|
||||
name="button_export_pdf"
|
||||
string="Export PDF"
|
||||
type="object"
|
||||
/>
|
||||
name="button_export_pdf"
|
||||
string="Export PDF"
|
||||
type="object"
|
||||
/>
|
||||
or
|
||||
<button
|
||||
name="button_export_xlsx"
|
||||
string="Export XLSX"
|
||||
type="object"
|
||||
/>
|
||||
name="button_export_xlsx"
|
||||
string="Export XLSX"
|
||||
type="object"
|
||||
/>
|
||||
or
|
||||
<button string="Cancel" class="oe_link" special="cancel" />
|
||||
</footer>
|
||||
|
||||
@@ -120,24 +120,24 @@
|
||||
<footer>
|
||||
<div invisible="not only_one_unaffected_earnings_account">
|
||||
<button
|
||||
name="button_export_html"
|
||||
string="View"
|
||||
type="object"
|
||||
default_focus="1"
|
||||
class="oe_highlight"
|
||||
/>
|
||||
name="button_export_html"
|
||||
string="View"
|
||||
type="object"
|
||||
default_focus="1"
|
||||
class="oe_highlight"
|
||||
/>
|
||||
or
|
||||
<button
|
||||
name="button_export_pdf"
|
||||
string="Export PDF"
|
||||
type="object"
|
||||
/>
|
||||
name="button_export_pdf"
|
||||
string="Export PDF"
|
||||
type="object"
|
||||
/>
|
||||
or
|
||||
<button
|
||||
name="button_export_xlsx"
|
||||
string="Export XLSX"
|
||||
type="object"
|
||||
/>
|
||||
name="button_export_xlsx"
|
||||
string="Export XLSX"
|
||||
type="object"
|
||||
/>
|
||||
or
|
||||
<button string="Cancel" class="oe_link" special="cancel" />
|
||||
</div>
|
||||
|
||||
@@ -26,24 +26,24 @@
|
||||
</group>
|
||||
<footer>
|
||||
<button
|
||||
name="button_export_html"
|
||||
string="View"
|
||||
type="object"
|
||||
default_focus="1"
|
||||
class="oe_highlight"
|
||||
/>
|
||||
name="button_export_html"
|
||||
string="View"
|
||||
type="object"
|
||||
default_focus="1"
|
||||
class="oe_highlight"
|
||||
/>
|
||||
or
|
||||
<button
|
||||
name="button_export_pdf"
|
||||
string="Export PDF"
|
||||
type="object"
|
||||
/>
|
||||
name="button_export_pdf"
|
||||
string="Export PDF"
|
||||
type="object"
|
||||
/>
|
||||
or
|
||||
<button
|
||||
name="button_export_xlsx"
|
||||
string="Export XLSX"
|
||||
type="object"
|
||||
/>
|
||||
name="button_export_xlsx"
|
||||
string="Export XLSX"
|
||||
type="object"
|
||||
/>
|
||||
or
|
||||
<button string="Cancel" class="oe_link" special="cancel" />
|
||||
</footer>
|
||||
|
||||
Reference in New Issue
Block a user