update from sources : ven. 29 nov. 2024 21:54:19 CET

account_analytic_tag/README.rst

@@ -7,7 +7,7 @@ Account Analytic Tag
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:84763ff35b584b58efcbe8b1aab6e2d0e8e9b9c3cf6002ff655ee92313e9c899
+   !! source digest: sha256:05ba5757128108b064acb3cde3157c60d2d451c38b457d38dc53a9e1b8695984
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -77,10 +77,10 @@ Authors
 Contributors
 ------------
 
--  `Tecnativa <https://www.tecnativa.com>`__:
+- `Tecnativa <https://www.tecnativa.com>`__:
 
-   -  Yadier Quesada
-   -  Víctor Martínez
+  - Yadier Quesada
+  - Víctor Martínez
 
 Maintainers
 -----------

account_analytic_tag/__manifest__.py

@@ -3,7 +3,7 @@
 
 {
     "name": "Account Analytic Tag",
-    "version": "17.0.1.0.0",
+    "version": "17.0.1.1.0",
     "author": "Tecnativa, Odoo Community Association (OCA)",
     "category": "Account",
     "website": "https://github.com/OCA/account-analytic",
@@ -13,6 +13,7 @@
         "security/ir.model.access.csv",
         "views/account_analytic_line_views.xml",
         "views/account_analytic_tag_views.xml",
+        "views/account_move_line_views.xml",
         "views/account_move_views.xml",
         "views/res_config_settings_views.xml",
     ],

account_analytic_tag/static/description/index.html

@@ -8,10 +8,11 @@
 
 /*
 :Author: David Goodger ([email protected])
-:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
 
 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
@@ -274,7 +275,7 @@
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: grey; } /* line numbers */
+pre.code .ln { color: gray; } /* line numbers */
 pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -300,7 +301,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic {
+span.problematic, pre.problematic {
   color: red }
 
 span.section-subtitle {
@@ -366,7 +367,7 @@ <h1 class="title">Account Analytic Tag</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:84763ff35b584b58efcbe8b1aab6e2d0e8e9b9c3cf6002ff655ee92313e9c899
+!! source digest: sha256:05ba5757128108b064acb3cde3157c60d2d451c38b457d38dc53a9e1b8695984
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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-analytic/tree/17.0/account_analytic_tag"><img alt="OCA/account-analytic" src="https://img.shields.io/badge/github-OCA%2Faccount--analytic-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/account-analytic-17-0/account-analytic-17-0-account_analytic_tag"><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-analytic&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module restores the <em>account analytic tags</em> as a method for
@@ -433,7 +434,9 @@ <h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
-<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
 <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>

account_analytic_tag/views/account_move_line_views.xml

@@ -0,0 +1,18 @@
+<odoo>
+    <record id="view_move_line_tree" model="ir.ui.view">
+        <field name="name">account.move.line.tree</field>
+        <field name="model">account.move.line</field>
+        <field name="inherit_id" ref="account.view_move_line_tree" />
+        <field name="arch" type="xml">
+            <field name="analytic_distribution" position="after">
+                <field
+                    name="analytic_tag_ids"
+                    groups="account_analytic_tag.group_analytic_tags"
+                    optional="hide"
+                    widget="many2many_tags"
+                    options="{'color_field': 'color'}"
+                />
+            </field>
+        </field>
+    </record>
+</odoo>

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:4d56adc35fff26b88020bebb3cd0fcb302b7c7c7483639925cfc4f9b850d8ac4
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |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,35 +90,35 @@ 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
 =========
 
 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 <[email protected]>
--  Yannick Vaucher <[email protected]>
--  Simone Orsi <[email protected]>
--  Leonardo Pistone <[email protected]>
--  Damien Crier <[email protected]>
--  Andrea Stirpe <[email protected]>
--  Thomas Rehn <[email protected]>
--  Andrea Gallina <[email protected]>
--  Robert Rottermann <[email protected]>
--  Ciro Urselli <[email protected]>
--  Francesco Apruzzese <[email protected]>
--  Lorenzo Battistini <https://github.com/eLBati>
--  Julien Coux <[email protected]>
--  Akim Juillerat <[email protected]>
--  Alexis de Lattre <[email protected]>
--  Mihai Fekete <[email protected]>
--  Miquel Ra??ch <[email protected]>
--  Joan Sisquella <[email protected]>
--  `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 <[email protected]>
--  Saran Lim. <[email protected]>
--  Omar Casti??eira <[email protected]>
+- Jordi Ballester <[email protected]>
+- Yannick Vaucher <[email protected]>
+- Simone Orsi <[email protected]>
+- Leonardo Pistone <[email protected]>
+- Damien Crier <[email protected]>
+- Andrea Stirpe <[email protected]>
+- Thomas Rehn <[email protected]>
+- Andrea Gallina <[email protected]>
+- Robert Rottermann <[email protected]>
+- Ciro Urselli <[email protected]>
+- Francesco Apruzzese <[email protected]>
+- Lorenzo Battistini <https://github.com/eLBati>
+- Julien Coux <[email protected]>
+- Akim Juillerat <[email protected]>
+- Alexis de Lattre <[email protected]>
+- Mihai Fekete <[email protected]>
+- Miquel Ra??ch <[email protected]>
+- Joan Sisquella <[email protected]>
+- `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 <[email protected]>
+- Saran Lim. <[email protected]>
+- Omar Casti??eira <[email protected]>
 
 Much of the work in this module was done at a sprint in Sorrento, Italy
 in April 2016.

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.5.0",
     "category": "Reporting",
     "summary": "OCA Financial Reports",
     "author": "Camptocamp,"

account_financial_report/report/general_ledger.py

@@ -762,6 +762,7 @@ def _get_centralized_ml(self, account, date_to, grouped_by):
             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 @@ def _get_report_values(self, docids, data):
                         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",

account_financial_report/report/general_ledger_xlsx.py

@@ -357,10 +357,11 @@ def _generate_report_content(self, workbook, report, data, report_data):
                             "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)