odoo-addon-account-financial-report 17.0.1.4.0.1__py3-none-any.whl → 17.0.1.6.0__py3-none-any.whl

odoo/addons/account_financial_report/README.rst

@@ -7,7 +7,7 @@ Account Financial Reports
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:4dd0964e1e5bccd75c7c56d0b89bd21f35a0f176bd7b9b69aaebb7db4f3bd729
+   !! source digest: sha256:20ae22a108ec709b3bf88351495514d82435eb77953df3f3164d48b9c58886cc
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -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
 ===========
@@ -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>`__:
-
-   -  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>`__:
-
-   -  Harald Panten
-   -  Valentin Vinagre
-
--  Lois Rilo <lois.rilo@forgeflow.com>
--  Saran Lim. <saranl@ecosoft.co.th>
--  Omar Casti??eira <omar@comunitea.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
+
+- `Sygel <https://www.sygel.es>`__:
+
+  - Harald Panten
+  - Valentin Vinagre
+
+- 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.

odoo/addons/account_financial_report/__manifest__.py

@@ -6,7 +6,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
     "name": "Account Financial Reports",
-    "version": "17.0.1.4.0",
+    "version": "17.0.1.6.0",
     "category": "Reporting",
     "summary": "OCA Financial Reports",
     "author": "Camptocamp,"

odoo/addons/account_financial_report/i18n/account_financial_report.pot

@@ -49,6 +49,13 @@ msgstr ""
 msgid "<b>Taxes summary</b>"
 msgstr ""
 
+#. module: account_financial_report
+#: model_terms:ir.ui.view,arch_db:account_financial_report.trial_balance_wizard
+msgid ""
+"<i class=\"fa fa-exclamation-triangle mr-3\"/>\n"
+"                    Duplicate amounts may be shown because more than one analytical account may be defined in the journal items."
+msgstr ""
+
 #. module: account_financial_report
 #: model_terms:ir.ui.view,arch_db:account_financial_report.res_config_settings_view_form
 msgid "<span class=\"o_form_label\">Intervals configuration</span>"
@@ -336,6 +343,7 @@ msgstr ""
 
 #. module: account_financial_report
 #: model:ir.model.fields,field_description:account_financial_report.field_account_move_line__analytic_account_ids
+#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__grouped_by__analytic_account
 msgid "Analytic Account"
 msgstr ""
 
@@ -945,6 +953,7 @@ msgstr ""
 
 #. module: account_financial_report
 #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__grouped_by
+#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__grouped_by
 msgid "Grouped By"
 msgstr ""
 
@@ -1586,6 +1595,14 @@ msgstr ""
 msgid "Starting account in a range"
 msgstr ""
 
+#. module: account_financial_report
+#. odoo-python
+#: code:addons/account_financial_report/report/trial_balance.py:0
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:0
+#, python-format
+msgid "TOTAL"
+msgstr ""
+
 #. module: account_financial_report
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines
 msgid "Tags"
@@ -1746,7 +1763,10 @@ msgid "To:"
 msgstr ""
 
 #. module: account_financial_report
+#. odoo-python
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:0
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_account_ending_cumul
+#, python-format
 msgid "Total"
 msgstr ""
 
@@ -1880,6 +1900,13 @@ msgstr ""
 msgid "With Account Name"
 msgstr ""
 
+#. module: account_financial_report
+#. odoo-python
+#: code:addons/account_financial_report/report/trial_balance.py:0
+#, python-format
+msgid "Without analytic account"
+msgstr ""
+
 #. module: account_financial_report
 #. odoo-python
 #: code:addons/account_financial_report/report/general_ledger_xlsx.py:0

odoo/addons/account_financial_report/report/general_ledger.py

@@ -762,6 +762,7 @@ class GeneralLedgerReport(models.AbstractModel):
             list_centralized_ml += list(centralized_ml[jnl_id].values())
         return list_centralized_ml
 
+    # flake8: noqa: C901
     def _get_report_values(self, docids, data):
         wizard_id = data["wizard_id"]
         company = self.env["res.company"].browse(data["company_id"])
@@ -836,6 +837,61 @@ class GeneralLedgerReport(models.AbstractModel):
                         account[grouped_by] = False
                         del account["list_grouped"]
         general_ledger = sorted(general_ledger, key=lambda k: k["code"])
+        # Set the bal_curr of the initial balance to 0 if it does not correspond
+        # (reducing the corresponding of the bal_curr of the initial balance).
+        for gl_item in general_ledger:
+            if not foreign_currency:
+                continue
+            if (
+                not gl_item["currency_id"]
+                or gl_item["currency_id"] != company.currency_id
+            ):
+                gl_item["fin_bal"]["bal_curr"] -= gl_item["init_bal"]["bal_curr"]
+                gl_item["init_bal"]["bal_curr"] = 0
+                if "list_grouped" in gl_item:
+                    for lg_item in gl_item["list_grouped"]:
+                        lg_item["fin_bal"]["bal_curr"] -= lg_item["init_bal"][
+                            "bal_curr"
+                        ]
+                        lg_item["init_bal"]["bal_curr"] = 0
+        # Set the fin_bal_currency_id value if the account does not have it set
+        # and there are move lines in a currency different from that of
+        # the company (USD for example).
+        for gl_item in general_ledger:
+            fin_bal_currency_ids = []
+            fin_bal_currency_id = gl_item["currency_id"]
+            if gl_item["currency_id"] or not foreign_currency:
+                continue
+            gl_item["fin_bal"]["bal_curr"] = gl_item["init_bal"]["bal_curr"]
+            if "move_lines" in gl_item:
+                for ml in gl_item["move_lines"]:
+                    ml_currency_id = (
+                        ml["currency_id"][0] if ml["currency_id"] else False
+                    )
+                    if ml_currency_id and ml_currency_id != company.currency_id.id:
+                        gl_item["fin_bal"]["bal_curr"] += ml["bal_curr"]
+                        if ml_currency_id not in fin_bal_currency_ids:
+                            fin_bal_currency_ids.append(ml_currency_id)
+            elif "list_grouped" in gl_item:
+                fin_bal_currency_ids = []
+                for lg_item in gl_item["list_grouped"]:
+                    lg_item["fin_bal"]["bal_curr"] = lg_item["init_bal"]["bal_curr"]
+                    for ml in lg_item["move_lines"]:
+                        ml_currency_id = (
+                            ml["currency_id"][0] if ml["currency_id"] else False
+                        )
+                        if ml_currency_id and ml_currency_id != company.currency_id.id:
+                            lg_item["fin_bal"]["bal_curr"] += ml["bal_curr"]
+                            gl_item["fin_bal"]["bal_curr"] += ml["bal_curr"]
+                            if ml_currency_id not in fin_bal_currency_ids:
+                                fin_bal_currency_ids.append(ml_currency_id)
+            # If there is only 1 currency, we set that one as fin_bal_currency_id
+            # The use of different move lines with different currencies (EUR + GBP)
+            # will be excluded. We use a different field to avoid showing the initial
+            # balance and/or distorting data.
+            if not gl_item["currency_id"] and len(fin_bal_currency_ids) == 1:
+                fin_bal_currency_id = fin_bal_currency_ids[0]
+            gl_item["fin_bal_currency_id"] = fin_bal_currency_id
         return {
             "doc_ids": [wizard_id],
             "doc_model": "general.ledger.report.wizard",

odoo/addons/account_financial_report/report/general_ledger_xlsx.py

@@ -357,10 +357,11 @@ class GeneralLedgerXslx(models.AbstractModel):
                             "final_balance": account["fin_bal"]["balance"],
                         }
                     )
-                    if foreign_currency and account["currency_id"]:
+                    if foreign_currency and account["fin_bal_currency_id"]:
                         account.update(
                             {
-                                "final_bal_curr": account["fin_bal"]["bal_curr"],
+                                "final_bal_curr": total_bal_curr,
+                                "currency_id": account["fin_bal_currency_id"],
                             }
                         )
                     self.write_ending_balance_from_dict(account, report_data)

odoo/addons/account_financial_report/report/templates/general_ledger.xml

@@ -24,7 +24,7 @@
             <div class="row">
                 <h4
                     class="mt0"
-                    t-esc="title or 'Odoo Report'"
+                    t-out="title or 'Odoo Report'"
                     style="text-align: center;"
                 />
             </div>
@@ -35,9 +35,9 @@
                     <!-- Display account header -->
                     <div class="act_as_table list_table" style="margin-top: 10px;" />
                     <div class="act_as_caption account_title" style="width: 100%">
-                        <span t-esc="account['code']" />
+                        <span t-out="account['code']" />
                         -
-                        <span t-esc="account['name']" />
+                        <span t-out="account['name']" />
                     </div>
                     <t t-if="'list_grouped' not in account">
                         <!-- Display account move lines without partner regroup -->
@@ -62,7 +62,7 @@
                             <div class="page_break">
                                 <!-- Display partner header -->
                                 <div class="act_as_caption account_title">
-                                    <span t-esc="group_item['name']" />
+                                    <span t-out="group_item['name']" />
                                 </div>
                                 <!-- Display partner move lines -->
                                 <t
@@ -113,9 +113,9 @@
             <div class="act_as_row">
                 <div class="act_as_cell">
                     From:
-                    <span t-esc="date_from" />
+                    <span t-out="date_from" />
                     To:
-                    <span t-esc="date_to" />
+                    <span t-out="date_to" />
                 </div>
                 <div class="act_as_cell">
                     <t t-if="only_posted_moves">All posted entries</t>
@@ -381,7 +381,7 @@
                                 view-type="form"
                             >
                                 <t
-                                    t-esc="line['date']"
+                                    t-out="line['date']"
                                     t-options="{'widget': 'date'}"
                                 />
                             </span>
@@ -390,7 +390,7 @@
                             <span>
                                 <!--## We don't use t-field because it throws an error on click -->
                                 <t
-                                    t-esc="line['date']"
+                                    t-out="line['date']"
                                     t-options="{'widget': 'date'}"
                                 />
                             </span>
@@ -435,12 +435,12 @@
                         <t t-if="taxes_data and line['tax_ids']">
                             <t t-foreach="line['tax_ids']" t-as="tax_id">
                                 <span
-                                    t-esc="o._get_atr_from_dict(tax_id, taxes_data, 'tax_name')"
+                                    t-out="o._get_atr_from_dict(tax_id, taxes_data, 'tax_name')"
                                 />
                             </t>
                         </t>
                         <t t-if="line['tax_line_id']">
-                            <span t-esc="line['tax_line_id'][1]" />
+                            <span t-out="line['tax_line_id'][1]" />
                         </t>
                     </div>
                     <!--## partner-->
@@ -486,13 +486,13 @@
                                         view-type="form"
                                     >
                                         <t
-                                            t-esc="o._get_atr_from_dict(int(analytic_id), analytic_data, 'name')"
+                                            t-out="o._get_atr_from_dict(int(analytic_id), analytic_data, 'name')"
                                         />
                                         <t
                                             t-if="int(line['analytic_distribution'][analytic_id]) &lt; 100"
                                         >
                                             <t
-                                                t-esc="int(line['analytic_distribution'][analytic_id])"
+                                                t-out="int(line['analytic_distribution'][analytic_id])"
                                             />%
                                         </t>
                                     </span>
@@ -506,7 +506,7 @@
                             <t t-if="line['tag_ids']">
                                 <t t-foreach="line['tag_ids']" t-as="tag_id">
                                     <span
-                                        t-esc="o._get_atr_from_dict(tag_id, tags_data, 'name')"
+                                        t-out="o._get_atr_from_dict(tag_id, tags_data, 'name')"
                                     />
                                 </t>
                             </t>
@@ -645,9 +645,9 @@
                 <!--## date-->
                 <t t-if='type == "account_type"'>
                     <div class="act_as_cell first_column" style="width: 41.32%;">
-                        <span t-esc="account['code']" />
+                        <span t-out="account['code']" />
                         -
-                        <span t-esc="account['name']" />
+                        <span t-out="account['name']" />
                     </div>
                     <div class="act_as_cell right" style="width: 16.9%;">Ending balance
                     </div>
@@ -672,21 +672,21 @@
                 <!--## debit-->
                 <div class="act_as_cell amount" style="width: 8.02%;">
                     <span
-                        t-esc="account_or_group_item_object['fin_bal']['debit']"
+                        t-out="account_or_group_item_object['fin_bal']['debit']"
                         t-options="{'widget': 'monetary', 'display_currency': company_currency}"
                     />
                 </div>
                 <!--## credit-->
                 <div class="act_as_cell amount" style="width: 8.02%;">
                     <span
-                        t-esc="account_or_group_item_object['fin_bal']['credit']"
+                        t-out="account_or_group_item_object['fin_bal']['credit']"
                         t-options="{'widget': 'monetary', 'display_currency': company_currency}"
                     />
                 </div>
                 <!--## balance cumulated-->
                 <div class="act_as_cell amount" style="width: 8.02%;">
                     <span
-                        t-esc="account_or_group_item_object['fin_bal']['balance']"
+                        t-out="account_or_group_item_object['fin_bal']['balance']"
                         t-options="{'widget': 'monetary', 'display_currency': company_currency}"
                     />
                 </div>
@@ -702,10 +702,10 @@
                 />
                 <t t-set="misc_grouped_domain" t-value="[]" t-else="" />
                 <t t-if="foreign_currency">
-                    <t t-if="account['currency_id']">
+                    <t t-if="account['fin_bal_currency_id']">
                         <t
                             t-set="account_currency"
-                            t-value="currency_model.browse(account['currency_id'])"
+                            t-value="currency_model.browse(account['fin_bal_currency_id'])"
                         />
                         <div class="act_as_cell amount" style="width: 3.63%;">
                             <t t-if="type == 'account_type'">