Merge PR #1528 into 19.0

Signed-off-by pedrobaeza

Author: OCA-git-bot

account_financial_report/README.rst

@@ -175,6 +175,7 @@ Contributors
   - Alexandre D. D??az
   - V??ctor Mart??nez
   - Carolina Fernandez
+  - Eduardo Ezerouali
 
 - `Sygel <https://www.sygel.es>`__:
 

account_financial_report/readme/CONTRIBUTORS.md

@@ -24,6 +24,7 @@
   - Alexandre D. D??az
   - V??ctor Mart??nez
   - Carolina Fernandez
+  - Eduardo Ezerouali
 - [Sygel](https://www.sygel.es):
   - Harald Panten
   - Valentin Vinagre

account_financial_report/report/abstract_report_xlsx.py

@@ -10,6 +10,20 @@ class AbstractReportXslx(models.AbstractModel):
     _description = "Abstract XLSX Account Financial Report"
     _inherit = "report.report_xlsx.abstract"
 
+    def _get_currency_from_company(self):
+        model = self.env.context.get("active_model")
+        active_id = self.env.context.get("active_id")
+        wizard = self.env[model].browse(active_id)
+        return wizard.company_id.currency_id
+
+    def _round_value_by_currency(self, value, currency=None):
+        if isinstance(currency, tuple):
+            currency = currency[0]
+        if currency:
+            return self.env["res.currency"].browse(currency).round(value)
+        else:
+            return self._get_currency_from_company().round(value)
+
     def get_workbook_options(self):
         vals = super().get_workbook_options()
         vals.update({"constant_memory": True})
@@ -54,7 +68,7 @@ def _define_formats(self, workbook, report_data):
          * format_amount
          * format_percent_bold_italic
         """
-        currency_id = self.env["res.company"]._default_currency_id()
+        currency_id = self._get_currency_from_company()
         report_data["formats"] = {
             "format_bold": workbook.add_format({"bold": True}),
             "format_right": workbook.add_format({"align": "right"}),
@@ -185,54 +199,6 @@ def write_array_header(self, report_data):
             )
         report_data["row_pos"] += 1
 
-    def write_line(self, line_object, report_data):
-        """Write a line on current line using all defined columns field name.
-        Columns are defined with `_get_report_columns` method.
-        """
-        for col_pos, column in report_data["columns"].items():
-            value = getattr(line_object, column["field"])
-            cell_type = column.get("type", "string")
-            if cell_type == "many2one":
-                report_data["sheet"].write_string(
-                    report_data["row_pos"],
-                    col_pos,
-                    value.name or "",
-                    report_data["formats"]["format_right"],
-                )
-            elif cell_type == "string":
-                if (
-                    hasattr(line_object, "account_group_id")
-                    and line_object.account_group_id
-                ):
-                    report_data["sheet"].write_string(
-                        report_data["row_pos"],
-                        col_pos,
-                        value or "",
-                        report_data["formats"]["format_bold"],
-                    )
-                else:
-                    report_data["sheet"].write_string(
-                        report_data["row_pos"], col_pos, value or ""
-                    )
-            elif cell_type == "amount":
-                if (
-                    hasattr(line_object, "account_group_id")
-                    and line_object.account_group_id
-                ):
-                    cell_format = report_data["formats"]["format_amount_bold"]
-                else:
-                    cell_format = report_data["formats"]["format_amount"]
-                report_data["sheet"].write_number(
-                    report_data["row_pos"], col_pos, float(value), cell_format
-                )
-            elif cell_type == "amount_currency":
-                if line_object.currency_id:
-                    format_amt = self._get_currency_amt_format(line_object, report_data)
-                    report_data["sheet"].write_number(
-                        report_data["row_pos"], col_pos, float(value), format_amt
-                    )
-        report_data["row_pos"] += 1
-
     def write_line_from_dict(self, line_dict, report_data):
         """Write a line on current line"""
         for col_pos, column in report_data["columns"].items():
@@ -265,15 +231,23 @@ def write_line_from_dict(self, line_dict, report_data):
                 else:
                     cell_format = report_data["formats"]["format_amount"]
                 report_data["sheet"].write_number(
-                    report_data["row_pos"], col_pos, float(value), cell_format
+                    report_data["row_pos"],
+                    col_pos,
+                    self._round_value_by_currency(value),
+                    cell_format,
                 )
             elif cell_type == "amount_currency":
                 if line_dict.get("currency_name", False):
                     format_amt = self._get_currency_amt_format_dict(
                         line_dict, report_data
                     )
                     report_data["sheet"].write_number(
-                        report_data["row_pos"], col_pos, float(value), format_amt
+                        report_data["row_pos"],
+                        col_pos,
+                        self._round_value_by_currency(
+                            value, line_dict.get("currency_id")
+                        ),
+                        format_amt,
                     )
             elif cell_type == "currency_name":
                 report_data["sheet"].write_string(
@@ -286,54 +260,6 @@ def write_line_from_dict(self, line_dict, report_data):
                 self.write_non_standard_column(cell_type, col_pos, value)
         report_data["row_pos"] += 1
 
-    def write_initial_balance(self, my_object, label, report_data):
-        """Write a specific initial balance line on current line
-        using defined columns field_initial_balance name.
-        Columns are defined with `_get_report_columns` method.
-        """
-        col_pos_label = self._get_col_pos_initial_balance_label()
-        report_data["sheet"].write(
-            report_data["row_pos"],
-            col_pos_label,
-            label,
-            report_data["formats"]["format_right"],
-        )
-        for col_pos, column in report_data["columns"].items():
-            if column.get("field_initial_balance"):
-                value = getattr(my_object, column["field_initial_balance"])
-                cell_type = column.get("type", "string")
-                if cell_type == "string":
-                    report_data["sheet"].write_string(
-                        report_data["row_pos"], col_pos, value or ""
-                    )
-                elif cell_type == "amount":
-                    report_data["sheet"].write_number(
-                        report_data["row_pos"],
-                        col_pos,
-                        float(value),
-                        report_data["formats"]["format_amount"],
-                    )
-                elif cell_type == "amount_currency":
-                    if my_object.currency_id:
-                        format_amt = self._get_currency_amt_format(
-                            my_object, report_data
-                        )
-                        report_data["sheet"].write_number(
-                            report_data["row_pos"], col_pos, float(value), format_amt
-                        )
-            elif column.get("field_currency_balance"):
-                value = getattr(my_object, column["field_currency_balance"])
-                cell_type = column.get("type", "string")
-                if cell_type == "many2one":
-                    if my_object.currency_id:
-                        report_data["sheet"].write_string(
-                            report_data["row_pos"],
-                            col_pos,
-                            value.name or "",
-                            report_data["formats"]["format_right"],
-                        )
-        report_data["row_pos"] += 1
-
     def write_initial_balance_from_dict(self, my_object, label, report_data):
         """Write a specific initial balance line on current line
         using defined columns field_initial_balance name.
@@ -358,16 +284,21 @@ def write_initial_balance_from_dict(self, my_object, label, report_data):
                     report_data["sheet"].write_number(
                         report_data["row_pos"],
                         col_pos,
-                        float(value),
+                        self._round_value_by_currency(value),
                         report_data["formats"]["format_amount"],
                     )
                 elif cell_type == "amount_currency":
                     if my_object["currency_id"]:
-                        format_amt = self._get_currency_amt_format(
+                        format_amt = self._get_currency_amt_format_dict(
                             my_object, report_data
                         )
                         report_data["sheet"].write_number(
-                            report_data["row_pos"], col_pos, float(value), format_amt
+                            report_data["row_pos"],
+                            col_pos,
+                            self._round_value_by_currency(
+                                value, my_object.get("currency_id")
+                            ),
+                            format_amt,
                         )
             elif column.get("field_currency_balance"):
                 value = my_object.get(column["field_currency_balance"], False)
@@ -382,73 +313,6 @@ def write_initial_balance_from_dict(self, my_object, label, report_data):
                         )
         report_data["row_pos"] += 1
 
-    def write_ending_balance(self, my_object, name, label, report_data):
-        """Write a specific ending balance line on current line
-        using defined columns field_final_balance name.
-        Columns are defined with `_get_report_columns` method.
-        """
-        for i in range(0, len(report_data["columns"])):
-            report_data["sheet"].write(
-                report_data["row_pos"],
-                i,
-                "",
-                report_data["formats"]["format_header_right"],
-            )
-        row_count_name = self._get_col_count_final_balance_name()
-        col_pos_label = self._get_col_pos_final_balance_label()
-        report_data["sheet"].merge_range(
-            report_data["row_pos"],
-            0,
-            report_data["row_pos"],
-            row_count_name - 1,
-            name,
-            report_data["formats"]["format_header_left"],
-        )
-        report_data["sheet"].write(
-            report_data["row_pos"],
-            col_pos_label,
-            label,
-            report_data["formats"]["format_header_right"],
-        )
-        for col_pos, column in report_data["columns"].items():
-            if column.get("field_final_balance"):
-                value = getattr(my_object, column["field_final_balance"])
-                cell_type = column.get("type", "string")
-                if cell_type == "string":
-                    report_data["sheet"].write_string(
-                        report_data["row_pos"],
-                        col_pos,
-                        value or "",
-                        report_data["formats"]["format_header_right"],
-                    )
-                elif cell_type == "amount":
-                    report_data["sheet"].write_number(
-                        report_data["row_pos"],
-                        col_pos,
-                        float(value),
-                        report_data["formats"]["format_header_amount"],
-                    )
-                elif cell_type == "amount_currency":
-                    if my_object.currency_id:
-                        format_amt = self._get_currency_amt_header_format(
-                            my_object, report_data
-                        )
-                        report_data["sheet"].write_number(
-                            report_data["row_pos"], col_pos, float(value), format_amt
-                        )
-            elif column.get("field_currency_balance"):
-                value = getattr(my_object, column["field_currency_balance"])
-                cell_type = column.get("type", "string")
-                if cell_type == "many2one":
-                    if my_object.currency_id:
-                        report_data["sheet"].write_string(
-                            report_data["row_pos"],
-                            col_pos,
-                            value.name or "",
-                            report_data["formats"]["format_header_right"],
-                        )
-        report_data["row_pos"] += 1
-
     def write_ending_balance_from_dict(self, my_object, name, label, report_data):
         """Write a specific ending balance line on current line
         using defined columns field_final_balance name.
@@ -492,7 +356,7 @@ def write_ending_balance_from_dict(self, my_object, name, label, report_data):
                     report_data["sheet"].write_number(
                         report_data["row_pos"],
                         col_pos,
-                        float(value),
+                        self._round_value_by_currency(value),
                         report_data["formats"]["format_header_amount"],
                     )
                 elif cell_type == "amount_currency":
@@ -501,7 +365,12 @@ def write_ending_balance_from_dict(self, my_object, name, label, report_data):
                             my_object, report_data
                         )
                         report_data["sheet"].write_number(
-                            report_data["row_pos"], col_pos, float(value), format_amt
+                            report_data["row_pos"],
+                            col_pos,
+                            self._round_value_by_currency(
+                                value, my_object.get("currency_id")
+                            ),
+                            format_amt,
                         )
             elif column.get("field_currency_balance"):
                 value = my_object.get(column["field_currency_balance"], False)
@@ -523,28 +392,6 @@ def write_ending_balance_from_dict(self, my_object, name, label, report_data):
                     )
         report_data["row_pos"] += 1
 
-    def _get_currency_amt_format(self, line_object, report_data):
-        """Return amount format specific for each currency."""
-        if "account_group_id" in line_object and line_object["account_group_id"]:
-            format_amt = report_data["formats"]["format_amount_bold"]
-            field_prefix = "format_amount_bold"
-        else:
-            format_amt = report_data["formats"]["format_amount"]
-            field_prefix = "format_amount"
-        if "currency_id" in line_object and line_object.get("currency_id", False):
-            if isinstance(line_object["currency_id"], int):
-                currency = self.env["res.currency"].browse(line_object["currency_id"])
-            else:
-                currency = line_object["currency_id"]
-            field_name = f"{field_prefix}_{currency.name}"
-            if hasattr(self, field_name):
-                format_amt = getattr(self, field_name)
-            else:
-                format_amt = report_data["workbook"].add_format()
-                report_data["field_name"] = format_amt
-                format_amt.set_num_format(self._report_xlsx_currency_format(currency))
-        return format_amt
-
     def _get_currency_amt_format_dict(self, line_dict, report_data):
         """Return amount format specific for each currency."""
         if line_dict.get("account_group_id", False) and line_dict["account_group_id"]:
@@ -567,24 +414,6 @@ def _get_currency_amt_format_dict(self, line_dict, report_data):
                 format_amt.set_num_format(self._report_xlsx_currency_format(currency))
         return format_amt
 
-    def _get_currency_amt_header_format(self, line_object, report_data):
-        """Return amount header format for each currency."""
-        format_amt = report_data["formats"]["format_header_amount"]
-        if line_object.currency_id:
-            field_name = f"format_header_amount_{line_object.currency_id.name}"
-            if hasattr(self, field_name):
-                format_amt = getattr(self, field_name)
-            else:
-                format_amt = report_data["workbook"].add_format(
-                    {"bold": True, "border": True, "bg_color": "#FFFFCC"}
-                )
-                report_data["field_name"] = format_amt
-                format_amount = "#,##0." + (
-                    "0" * line_object.currency_id.decimal_places
-                )
-                format_amt.set_num_format(format_amount)
-        return format_amt
-
     def _get_currency_amt_header_format_dict(self, line_object, report_data):
         """Return amount header format for each currency."""
         format_amt = report_data["formats"]["format_header_amount"]

account_financial_report/report/general_ledger_xlsx.py

@@ -309,12 +309,20 @@ def _generate_report_content(self, workbook, report, data, report_data):
                             for account_ids, value in line[
                                 "analytic_distribution"
                             ].items():
-                                for account_id in account_ids.split(","):
+                                names = " ".join(
+                                    analytic_data[int(account_id.strip())]["name"]
+                                    for account_id in account_ids.split(",")
+                                )
+                                if value < 100:
                                     analytic_distribution += (
-                                        f"{analytic_data[int(account_id)]['name']} "
+                                        "%s %d%% ",
+                                        (
+                                            names,
+                                            value,
+                                        ),
                                     )
-                                    if value < 100:
-                                        analytic_distribution += f"{value:d}% "
+                                else:
+                                    analytic_distribution += f"{names} "
                             line.update(
                                 {
                                     "taxes_description": taxes_description,

account_financial_report/static/description/index.html

@@ -521,6 +521,7 @@ <h3><a class="toc-backref" href="#toc-entry-10">Contributors</a></h3>
 <li>Alexandre D. D??az</li>
 <li>V??ctor Mart??nez</li>
 <li>Carolina Fernandez</li>
+<li>Eduardo Ezerouali</li>
 </ul>
 </li>
 <li><a class="reference external" href="https://www.sygel.es">Sygel</a>:<ul>