odoo-addon-account-financial-report 15.0.1.1.0.1__py3-none-any.whl → 18.0.1.4.4.3__py3-none-any.whl

odoo/addons/account_financial_report/report/general_ledger_xlsx.py

@@ -2,6 +2,7 @@
 # Author: Julien Coux
 # Copyright 2016 Camptocamp SA
 # Copyright 2021 Tecnativa - João Marques
+# Copyright 2022 Tecnativa - V??ctor Mart??nez
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from odoo import _, models
@@ -17,7 +18,7 @@ class GeneralLedgerXslx(models.AbstractModel):
         report_name = _("General Ledger")
         if company_id:
             company = self.env["res.company"].browse(company_id)
-            suffix = " - {} - {}".format(company.name, company.currency_id.name)
+            suffix = f" - {company.name} - {company.currency_id.name}"
             report_name = report_name + suffix
         return report_name
 
@@ -34,15 +35,11 @@ class GeneralLedgerXslx(models.AbstractModel):
         if report.show_cost_center:
             res += [
                 {
-                    "header": _("Analytic Account"),
-                    "field": "analytic_account",
+                    "header": _("Analytic Distribution"),
+                    "field": "analytic_distribution",
                     "width": 20,
                 },
             ]
-        if report.show_analytic_tags:
-            res += [
-                {"header": _("Tags"), "field": "tags", "width": 10},
-            ]
         res += [
             {"header": _("Rec."), "field": "rec_name", "width": 15},
             {
@@ -72,20 +69,21 @@ class GeneralLedgerXslx(models.AbstractModel):
         ]
         if report.foreign_currency:
             res += [
-                {
-                    "header": _("Cur."),
-                    "field": "currency_name",
-                    "field_currency_balance": "currency_name",
-                    "type": "currency_name",
-                    "width": 7,
-                },
                 {
                     "header": _("Amount cur."),
                     "field": "bal_curr",
                     "field_initial_balance": "initial_bal_curr",
                     "field_final_balance": "final_bal_curr",
                     "type": "amount_currency",
-                    "width": 14,
+                    "width": 10,
+                },
+                {
+                    "header": _("Cumul cur."),
+                    "field": "total_bal_curr",
+                    "field_initial_balance": "initial_bal_curr",
+                    "field_final_balance": "final_bal_curr",
+                    "type": "amount_currency",
+                    "width": 10,
                 },
             ]
         res_as_dict = {}
@@ -111,10 +109,6 @@ class GeneralLedgerXslx(models.AbstractModel):
                 _("Hide") if report.hide_account_at_0 else _("Show"),
             ],
             [_("Centralize filter"), _("Yes") if report.centralize else _("No")],
-            [
-                _("Show analytic tags"),
-                _("Yes") if report.show_analytic_tags else _("No"),
-            ],
             [
                 _("Show foreign currency"),
                 _("Yes") if report.foreign_currency else _("No"),
@@ -143,21 +137,22 @@ class GeneralLedgerXslx(models.AbstractModel):
         ]._get_report_values(report, data)
         general_ledger = res_data["general_ledger"]
         accounts_data = res_data["accounts_data"]
-        partners_data = res_data["partners_data"]
         journals_data = res_data["journals_data"]
         taxes_data = res_data["taxes_data"]
-        tags_data = res_data["tags_data"]
+        analytic_data = res_data["analytic_data"]
         filter_partner_ids = res_data["filter_partner_ids"]
         foreign_currency = res_data["foreign_currency"]
+        company_currency = res_data["company_currency"]
         # For each account
         for account in general_ledger:
             # Write account title
+            total_bal_curr = 0
             self.write_array_title(
                 account["code"] + " - " + accounts_data[account["id"]]["name"],
                 report_data,
             )
 
-            if not account["partners"]:
+            if "list_grouped" not in account:
                 # Display array header for move lines
                 self.write_array_header(report_data)
 
@@ -169,7 +164,7 @@ class GeneralLedgerXslx(models.AbstractModel):
                         "initial_balance": account["init_bal"]["balance"],
                     }
                 )
-                if foreign_currency:
+                if foreign_currency and account["currency_id"]:
                     account.update(
                         {"initial_bal_curr": account["init_bal"]["bal_curr"]}
                     )
@@ -183,7 +178,10 @@ class GeneralLedgerXslx(models.AbstractModel):
                             "journal": journals_data[line["journal_id"]]["code"],
                         }
                     )
-                    if line["currency_id"]:
+                    line_currency_id = (
+                        line["currency_id"][0] if line["currency_id"] else False
+                    )
+                    if line_currency_id and line_currency_id != company_currency.id:
                         line.update(
                             {
                                 "currency_name": line["currency_id"][1],
@@ -192,17 +190,35 @@ class GeneralLedgerXslx(models.AbstractModel):
                         )
                     if line["ref_label"] != "Centralized entries":
                         taxes_description = ""
-                        tags = ""
+                        analytic_distribution = ""
                         for tax_id in line["tax_ids"]:
                             taxes_description += taxes_data[tax_id]["tax_name"] + " "
-                        for tag_id in line["tag_ids"]:
-                            tags += tags_data[tag_id]["name"] + " "
+                        if line["tax_line_id"]:
+                            taxes_description += line["tax_line_id"][1]
+                        for account_ids, value in line["analytic_distribution"].items():
+                            for account_id in account_ids.split(","):
+                                if value < 100:
+                                    analytic_distribution += "%s %d%% " % (
+                                        analytic_data[int(account_id)]["name"],
+                                        value,
+                                    )
+                                else:
+                                    analytic_distribution += (
+                                        f"{analytic_data[int(account_id)]['name']} "
+                                    )
                         line.update(
                             {
                                 "taxes_description": taxes_description,
-                                "tags": tags,
+                                "analytic_distribution": analytic_distribution,
                             }
                         )
+                    if (
+                        foreign_currency
+                        and line_currency_id
+                        and line_currency_id != company_currency.id
+                    ):
+                        total_bal_curr += line["bal_curr"]
+                        line.update({"total_bal_curr": total_bal_curr})
                     self.write_line_from_dict(line, report_data)
                 # Display ending balance line for account
                 account.update(
@@ -212,7 +228,7 @@ class GeneralLedgerXslx(models.AbstractModel):
                         "final_balance": account["fin_bal"]["balance"],
                     }
                 )
-                if foreign_currency:
+                if foreign_currency and account["currency_id"]:
                     account.update(
                         {
                             "final_bal_curr": account["fin_bal"]["bal_curr"],
@@ -222,43 +238,59 @@ class GeneralLedgerXslx(models.AbstractModel):
 
             else:
                 # For each partner
-                for partner in account["list_partner"]:
+                total_bal_curr = 0
+                for group_item in account["list_grouped"]:
                     # Write partner title
-                    self.write_array_title(
-                        partners_data[partner["id"]]["name"], report_data
-                    )
+                    self.write_array_title(group_item["name"], report_data)
 
                     # Display array header for move lines
                     self.write_array_header(report_data)
 
+                    account.update(
+                        {
+                            "currency_id": accounts_data[account["id"]]["currency_id"],
+                            "currency_name": accounts_data[account["id"]][
+                                "currency_name"
+                            ],
+                        }
+                    )
+
                     # Display initial balance line for partner
-                    partner.update(
+                    group_item.update(
                         {
-                            "initial_debit": partner["init_bal"]["debit"],
-                            "initial_credit": partner["init_bal"]["credit"],
-                            "initial_balance": partner["init_bal"]["balance"],
-                            "name": partners_data[partner["id"]]["name"],
+                            "initial_debit": group_item["init_bal"]["debit"],
+                            "initial_credit": group_item["init_bal"]["credit"],
+                            "initial_balance": group_item["init_bal"]["balance"],
                             "type": "partner",
+                            "grouped_by": account["grouped_by"]
+                            if "grouped_by" in account
+                            else "",
                             "currency_id": accounts_data[account["id"]]["currency_id"],
+                            "currency_name": accounts_data[account["id"]][
+                                "currency_name"
+                            ],
                         }
                     )
-                    if foreign_currency:
-                        partner.update(
+                    if foreign_currency and account["currency_id"]:
+                        group_item.update(
                             {
-                                "initial_bal_curr": partner["init_bal"]["bal_curr"],
+                                "initial_bal_curr": group_item["init_bal"]["bal_curr"],
                             }
                         )
-                    self.write_initial_balance_from_dict(partner, report_data)
+                    self.write_initial_balance_from_dict(group_item, report_data)
 
                     # Display account move lines
-                    for line in partner["move_lines"]:
+                    for line in group_item["move_lines"]:
                         line.update(
                             {
                                 "account": account["code"],
                                 "journal": journals_data[line["journal_id"]]["code"],
                             }
                         )
-                        if line["currency_id"]:
+                        line_currency_id = (
+                            line["currency_id"][0] if line["currency_id"] else False
+                        )
+                        if line_currency_id and line_currency_id != company_currency.id:
                             line.update(
                                 {
                                     "currency_name": line["currency_id"][1],
@@ -267,38 +299,54 @@ class GeneralLedgerXslx(models.AbstractModel):
                             )
                         if line["ref_label"] != "Centralized entries":
                             taxes_description = ""
-                            tags = ""
+                            analytic_distribution = ""
                             for tax_id in line["tax_ids"]:
                                 taxes_description += (
                                     taxes_data[tax_id]["tax_name"] + " "
                                 )
-                            for tag_id in line["tag_ids"]:
-                                tags += tags_data[tag_id]["name"] + " "
+                            for account_ids, value in line[
+                                "analytic_distribution"
+                            ].items():
+                                for account_id in account_ids.split(","):
+                                    if value < 100:
+                                        analytic_distribution += "%s %d%% " % (
+                                            analytic_data[int(account_id)]["name"],
+                                            value,
+                                        )
+                                    else:
+                                        analytic_distribution += (
+                                            f"{analytic_data[int(account_id)]['name']} "
+                                        )
                             line.update(
                                 {
                                     "taxes_description": taxes_description,
-                                    "tags": tags,
+                                    "analytic_distribution": analytic_distribution,
                                 }
                             )
+                        if (
+                            foreign_currency
+                            and line_currency_id
+                            and line_currency_id != company_currency.id
+                        ):
+                            total_bal_curr += line["bal_curr"]
+                            line.update({"total_bal_curr": total_bal_curr})
                         self.write_line_from_dict(line, report_data)
 
                     # Display ending balance line for partner
-                    partner.update(
+                    group_item.update(
                         {
-                            "final_debit": partner["fin_bal"]["debit"],
-                            "final_credit": partner["fin_bal"]["credit"],
-                            "final_balance": partner["fin_bal"]["balance"],
+                            "final_debit": group_item["fin_bal"]["debit"],
+                            "final_credit": group_item["fin_bal"]["credit"],
+                            "final_balance": group_item["fin_bal"]["balance"],
                         }
                     )
-                    if foreign_currency and partner["currency_id"]:
-                        partner.update(
+                    if foreign_currency and group_item["currency_id"]:
+                        group_item.update(
                             {
-                                "final_bal_curr": partner["fin_bal"]["bal_curr"],
-                                "currency_name": partner["currency_id"].name,
-                                "currency_id": partner["currency_id"].id,
+                                "final_bal_curr": group_item["fin_bal"]["bal_curr"],
                             }
                         )
-                    self.write_ending_balance_from_dict(partner, report_data)
+                    self.write_ending_balance_from_dict(group_item, report_data)
 
                     # Line break
                     report_data["row_pos"] += 1
@@ -311,12 +359,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"],
-                                "currency_name": account["currency_id"].name,
-                                "currency_id": account["currency_id"].id,
+                                "final_bal_curr": total_bal_curr,
+                                "currency_id": account["fin_bal_currency_id"],
                             }
                         )
                     self.write_ending_balance_from_dict(account, report_data)
@@ -326,22 +373,27 @@ class GeneralLedgerXslx(models.AbstractModel):
 
     def write_initial_balance_from_dict(self, my_object, report_data):
         """Specific function to write initial balance for General Ledger"""
-        if "partner" in my_object["type"]:
-            label = _("Partner Initial balance")
-        elif "account" in my_object["type"]:
-            label = _("Initial balance")
-        return super(GeneralLedgerXslx, self).write_initial_balance_from_dict(
-            my_object, label, report_data
-        )
+        label = False
+        if "account" not in my_object["type"] and "grouped_by" in my_object:
+            if my_object["grouped_by"] == "partners":
+                label = _("Partner Initial balance")
+            elif my_object["grouped_by"] == "taxes":
+                label = _("Tax Initial balance")
+        label = label if label else _("Initial balance")
+        return super().write_initial_balance_from_dict(my_object, label, report_data)
 
     def write_ending_balance_from_dict(self, my_object, report_data):
         """Specific function to write ending balance for General Ledger"""
-        if "partner" in my_object["type"]:
-            name = my_object["name"]
-            label = _("Partner ending balance")
-        elif "account" in my_object["type"]:
+        label = name = False
+        if "account" in my_object["type"]:
             name = my_object["code"] + " - " + my_object["name"]
-            label = _("Ending balance")
-        return super(GeneralLedgerXslx, self).write_ending_balance_from_dict(
+        elif "grouped_by" in my_object:
+            name = my_object["name"]
+            if my_object["grouped_by"] == "partners":
+                label = _("Partner ending balance")
+            elif my_object["grouped_by"] == "taxes":
+                label = _("Tax ending balance")
+        label = label if label else _("Ending balance")
+        return super().write_ending_balance_from_dict(
             my_object, name, label, report_data
         )

odoo/addons/account_financial_report/report/journal_ledger.py

@@ -3,11 +3,13 @@
 
 import itertools
 import operator
+from collections import defaultdict
 
 from odoo import models
 
 
 class JournalLedgerReport(models.AbstractModel):
+    _inherit = "report.account_financial_report.abstract_report"
     _name = "report.account_financial_report.journal_ledger"
     _description = "Journal Ledger Report"
 
@@ -32,9 +34,13 @@ class JournalLedgerReport(models.AbstractModel):
         return domain
 
     def _get_journal_ledgers(self, wizard, journal_ids, company):
-        journals = self.env["account.journal"].search(
-            self._get_journal_ledgers_domain(wizard, journal_ids, company),
-            order="name asc",
+        journals = (
+            self.env["account.journal"]
+            .with_context(active_test=False)
+            .search(
+                self._get_journal_ledgers_domain(wizard, journal_ids, company),
+                order="name asc",
+            )
         )
         journal_ledgers_data = []
         for journal in journals:
@@ -81,15 +87,21 @@ class JournalLedgerReport(models.AbstractModel):
         return moves.ids, Moves, move_data
 
     def _get_move_lines_domain(self, move_ids, wizard, journal_ids):
-        return [("display_type", "=", False), ("move_id", "in", move_ids)]
+        return [
+            ("display_type", "not in", ["line_note", "line_section"]),
+            ("move_id", "in", move_ids),
+        ]
 
     def _get_move_lines_order(self, move_ids, wizard, journal_ids):
-        return ""
+        """Add `move_id` to make sure the order of the records is correct
+        (especially if we use auto-sequence).
+        """
+        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
@@ -131,7 +143,7 @@ class JournalLedgerReport(models.AbstractModel):
         return {
             "name": account.name,
             "code": account.code,
-            "internal_type": account.internal_type,
+            "account_type": account.account_type,
         }
 
     def _get_partner_data(self, partners):
@@ -175,13 +187,23 @@ class JournalLedgerReport(models.AbstractModel):
         return {"move_line_ids": tuple(move_lines.ids)}
 
     def _get_move_lines(self, move_ids, wizard, journal_ids):
-        move_lines = self.env["account.move.line"].search(
-            self._get_move_lines_domain(move_ids, wizard, journal_ids),
-            order=self._get_move_lines_order(move_ids, wizard, journal_ids),
+        move_lines = (
+            self.env["account.move.line"]
+            .with_context(prefetch_fields=False)
+            .search(
+                self._get_move_lines_domain(move_ids, wizard, journal_ids),
+                order=self._get_move_lines_order(move_ids, wizard, journal_ids),
+            )
         )
-        move_lines_exigible = self.env["account.move.line"].search(
-            self._get_move_lines_domain(move_ids, wizard, journal_ids)
-            + self.env["account.move.line"]._get_tax_exigible_domain(),
+        # Get the exigible move lines ids instead of the recordset to increase
+        # performance with a large number of journal items
+        move_lines_exigible_ids = set(
+            self.env["account.move.line"]
+            .search(
+                self._get_move_lines_domain(move_ids, wizard, journal_ids)
+                + self.env["account.move.line"]._get_tax_exigible_domain(),
+            )
+            .ids
         )
         move_line_ids_taxes_data = {}
         if move_lines:
@@ -203,36 +225,24 @@ class JournalLedgerReport(models.AbstractModel):
                     "description": tax_description,
                 }
         Move_Lines = {}
-        accounts = self.env["account.account"]
-        partners = self.env["res.partner"]
-        currencies = self.env["res.currency"]
-        tax_lines = self.env["account.tax"]
         auto_sequence = len(move_ids)
+        Move_Lines = defaultdict(list)
         for ml in move_lines:
-            if ml.account_id not in accounts:
-                accounts |= ml.account_id
-            if ml.partner_id not in partners:
-                partners |= ml.partner_id
-            if ml.currency_id not in currencies:
-                currencies |= ml.currency_id
-            if ml.tax_line_id not in tax_lines:
-                tax_lines |= ml.tax_line_id
-            if ml.move_id.id not in Move_Lines.keys():
-                Move_Lines[ml.move_id.id] = []
+            move_id = ml.move_id.id
+            if move_id not in Move_Lines:
                 auto_sequence -= 1
-            taxes = (
-                ml.id in move_line_ids_taxes_data.keys()
-                and move_line_ids_taxes_data[ml.id]
-                or {}
-            )
-            exigible = ml in move_lines_exigible
-            Move_Lines[ml.move_id.id].append(
+            taxes = move_line_ids_taxes_data.get(ml.id, {})
+            # Check the exigibility of the move line by id
+            # this way we avoid the recreation of the recordset which affects to the
+            # performance in the case of a large number of journal items
+            exigible = ml.id in move_lines_exigible_ids
+            Move_Lines[move_id].append(
                 self._get_move_lines_data(ml, wizard, taxes, auto_sequence, exigible)
             )
-        account_ids_data = self._get_account_data(accounts)
-        partner_ids_data = self._get_partner_data(partners)
-        currency_ids_data = self._get_currency_data(currencies)
-        tax_line_ids_data = self._get_tax_line_data(tax_lines)
+        account_ids_data = self._get_account_data(move_lines.account_id)
+        partner_ids_data = self._get_partner_data(move_lines.partner_id)
+        currency_ids_data = self._get_currency_data(move_lines.currency_id)
+        tax_line_ids_data = self._get_tax_line_data(move_lines.tax_line_id)
         return (
             move_lines.ids,
             Move_Lines,
@@ -258,7 +268,11 @@ class JournalLedgerReport(models.AbstractModel):
                 journal_id = ml_data["journal_id"]
                 if journal_id not in journals_taxes_data.keys():
                     journals_taxes_data[journal_id] = {}
-                taxes = self.env["account.tax"].browse(tax_ids)
+                taxes = (
+                    self.env["account.tax"]
+                    .with_context(active_test=False)
+                    .search_fetch([("id", "in", tax_ids)], ["name", "description"])
+                )
                 for tax in taxes:
                     if tax.id not in journals_taxes_data[journal_id]:
                         journals_taxes_data[journal_id][tax.id] = {
@@ -293,6 +307,7 @@ class JournalLedgerReport(models.AbstractModel):
         return journals_taxes_data_2
 
     def _get_report_values(self, docids, data):
+        res = super()._get_report_values(docids, data)
         wizard_id = data["wizard_id"]
         wizard = self.env["journal.ledger.report.wizard"].browse(wizard_id)
         company = self.env["res.company"].browse(data["company_id"])
@@ -306,11 +321,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]
@@ -346,25 +359,28 @@ class JournalLedgerReport(models.AbstractModel):
             if journal_id in journal_totals.keys():
                 for item in ["debit", "credit"]:
                     journal_ledger_data[item] += journal_totals[journal_id][item]
-        return {
-            "doc_ids": [wizard_id],
-            "doc_model": "journal.ledger.report.wizard",
-            "docs": self.env["journal.ledger.report.wizard"].browse(wizard_id),
-            "group_option": data["group_option"],
-            "foreign_currency": data["foreign_currency"],
-            "with_account_name": data["with_account_name"],
-            "company_name": company.display_name,
-            "currency_name": company.currency_id.name,
-            "date_from": data["date_from"],
-            "date_to": data["date_to"],
-            "move_target": data["move_target"],
-            "with_auto_sequence": data["with_auto_sequence"],
-            "account_ids_data": account_ids_data,
-            "partner_ids_data": partner_ids_data,
-            "currency_ids_data": currency_ids_data,
-            "move_ids_data": move_ids_data,
-            "tax_line_data": tax_line_ids_data,
-            "move_line_ids_taxes_data": move_line_ids_taxes_data,
-            "Journal_Ledgers": journal_ledgers_data,
-            "Moves": moves_data,
-        }
+        res.update(
+            {
+                "doc_ids": [wizard_id],
+                "doc_model": "journal.ledger.report.wizard",
+                "docs": self.env["journal.ledger.report.wizard"].browse(wizard_id),
+                "group_option": data["group_option"],
+                "foreign_currency": data["foreign_currency"],
+                "with_account_name": data["with_account_name"],
+                "company_name": company.display_name,
+                "currency_name": company.currency_id.name,
+                "date_from": data["date_from"],
+                "date_to": data["date_to"],
+                "move_target": data["move_target"],
+                "with_auto_sequence": data["with_auto_sequence"],
+                "account_ids_data": account_ids_data,
+                "partner_ids_data": partner_ids_data,
+                "currency_ids_data": currency_ids_data,
+                "move_ids_data": move_ids_data,
+                "tax_line_data": tax_line_ids_data,
+                "move_line_ids_taxes_data": move_line_ids_taxes_data,
+                "Journal_Ledgers": journal_ledgers_data,
+                "Moves": moves_data,
+            }
+        )
+        return res