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/abstract_report_xlsx.py

@@ -75,9 +75,7 @@ class AbstractReportXslx(models.AbstractModel):
                 {"bold": True, "border": True, "bg_color": "#FFFFCC"}
             ),
             "format_amount": workbook.add_format(),
-            "format_amount_bold": workbook.add_format({"bold": True}).set_num_format(
-                "#,##0." + "0" * currency_id.decimal_places
-            ),
+            "format_amount_bold": workbook.add_format({"bold": True}),
             "format_percent_bold_italic": workbook.add_format(
                 {"bold": True, "italic": True}
             ),
@@ -89,6 +87,9 @@ class AbstractReportXslx(models.AbstractModel):
             "#,##0." + "0" * currency_id.decimal_places
         )
         report_data["formats"]["format_percent_bold_italic"].set_num_format("#,##0.00%")
+        report_data["formats"]["format_amount_bold"].set_num_format(
+            "#,##0." + "0" * currency_id.decimal_places
+        )
 
     def _set_column_width(self, report_data):
         """Set width for all defined columns.
@@ -238,10 +239,7 @@ class AbstractReportXslx(models.AbstractModel):
             value = line_dict.get(column["field"], False)
             cell_type = column.get("type", "string")
             if cell_type == "string":
-                if (
-                    line_dict.get("account_group_id", False)
-                    and line_dict["account_group_id"]
-                ):
+                if line_dict.get("type", "") == "group_type":
                     report_data["sheet"].write_string(
                         report_data["row_pos"],
                         col_pos,
@@ -284,6 +282,8 @@ class AbstractReportXslx(models.AbstractModel):
                     value or "",
                     report_data["formats"]["format_right"],
                 )
+            else:
+                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):
@@ -496,7 +496,7 @@ class AbstractReportXslx(models.AbstractModel):
                         report_data["formats"]["format_header_amount"],
                     )
                 elif cell_type == "amount_currency":
-                    if my_object["currency_id"] and value:
+                    if my_object["currency_id"]:
                         format_amt = self._get_currency_amt_format_dict(
                             my_object, report_data
                         )
@@ -532,16 +532,17 @@ class AbstractReportXslx(models.AbstractModel):
             format_amt = report_data["formats"]["format_amount"]
             field_prefix = "format_amount"
         if "currency_id" in line_object and line_object.get("currency_id", False):
-            field_name = "{}_{}".format(field_prefix, line_object["currency_id"].name)
+            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_amount = "#,##0." + (
-                    "0" * line_object["currency_id"].decimal_places
-                )
-                format_amt.set_num_format(format_amount)
+                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):
@@ -557,21 +558,20 @@ class AbstractReportXslx(models.AbstractModel):
                 currency = self.env["res.currency"].browse(line_dict["currency_id"])
             else:
                 currency = line_dict["currency_id"]
-            field_name = "{}_{}".format(field_prefix, currency.name)
+            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_amount = "#,##0." + ("0" * currency.decimal_places)
-                format_amt.set_num_format(format_amount)
+                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 = "format_header_amount_%s" % line_object.currency_id.name
+            field_name = f"format_header_amount_{line_object.currency_id.name}"
             if hasattr(self, field_name):
                 format_amt = getattr(self, field_name)
             else:
@@ -589,7 +589,7 @@ class AbstractReportXslx(models.AbstractModel):
         """Return amount header format for each currency."""
         format_amt = report_data["formats"]["format_header_amount"]
         if line_object["currency_id"]:
-            field_name = "format_header_amount_%s" % line_object["currency_name"]
+            field_name = f"format_header_amount_{line_object['currency_name']}"
             if hasattr(self, field_name):
                 format_amt = getattr(self, field_name)
             else:
@@ -597,9 +597,8 @@ class AbstractReportXslx(models.AbstractModel):
                     {"bold": True, "border": True, "bg_color": "#FFFFCC"}
                 )
                 report_data["field_name"] = format_amt
-                format_amount = "#,##0." + (
-                    "0" * line_object["currency_id"].decimal_places
-                )
+                currency = self.env["res.currency"].browse(line_object["currency_id"])
+                format_amount = "#,##0." + ("0" * currency.decimal_places)
                 format_amt.set_num_format(format_amount)
         return format_amt
 
@@ -611,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
@@ -690,3 +689,9 @@ class AbstractReportXslx(models.AbstractModel):
         :return: the columns position used for final balance label.
         """
         raise NotImplementedError()
+
+    def write_non_standard_column(self, cell_type, col_pos, value):
+        """
+        Write columns out of the columns type defined here.
+        """
+        raise NotImplementedError()

odoo/addons/account_financial_report/report/aged_partner_balance.py

@@ -25,6 +25,8 @@ class AgedPartnerBalanceReport(models.AbstractModel):
         ag_pb_data[acc_id]["90_days"] = 0.0
         ag_pb_data[acc_id]["120_days"] = 0.0
         ag_pb_data[acc_id]["older"] = 0.0
+        for interval_line in self.env.context["age_partner_config"].line_ids:
+            ag_pb_data[acc_id][interval_line] = 0.0
         return ag_pb_data
 
     @api.model
@@ -39,6 +41,8 @@ class AgedPartnerBalanceReport(models.AbstractModel):
         ag_pb_data[acc_id][prt_id]["120_days"] = 0.0
         ag_pb_data[acc_id][prt_id]["older"] = 0.0
         ag_pb_data[acc_id][prt_id]["move_lines"] = []
+        for interval_line in self.env.context["age_partner_config"].line_ids:
+            ag_pb_data[acc_id][prt_id][interval_line] = 0.0
         return ag_pb_data
 
     @api.model
@@ -47,10 +51,12 @@ class AgedPartnerBalanceReport(models.AbstractModel):
     ):
         ag_pb_data[acc_id]["residual"] += residual
         ag_pb_data[acc_id][prt_id]["residual"] += residual
+        interval_lines = self.env.context["age_partner_config"].line_ids
         today = date_at_object
         if not due_date or today <= due_date:
             ag_pb_data[acc_id]["current"] += residual
             ag_pb_data[acc_id][prt_id]["current"] += residual
+            due_date = today
         elif today <= due_date + timedelta(days=30):
             ag_pb_data[acc_id]["30_days"] += residual
             ag_pb_data[acc_id][prt_id]["30_days"] += residual
@@ -66,29 +72,73 @@ class AgedPartnerBalanceReport(models.AbstractModel):
         else:
             ag_pb_data[acc_id]["older"] += residual
             ag_pb_data[acc_id][prt_id]["older"] += residual
+
+        days_difference = abs((today - due_date).days)
+        for index, line in enumerate(interval_lines):
+            lower_limit = 0 if not index else interval_lines[index - 1].inferior_limit
+            next_line = interval_lines[index] if index < len(interval_lines) else None
+            interval_range = self._get_values_for_range_intervals(
+                lower_limit, next_line.inferior_limit
+            )
+            if (
+                days_difference in interval_range
+                or days_difference == line.inferior_limit
+            ):
+                ag_pb_data[acc_id][line] += residual
+                ag_pb_data[acc_id][prt_id][line] += residual
+                break
         return ag_pb_data
 
+    def _get_values_for_range_intervals(self, num1, num2):
+        min_num = min(num1, num2)
+        max_num = max(num1, num2)
+        if abs(num2 - num1) == 1:
+            return [max_num]
+        return list(range(min_num + 1, max_num))
+
     def _get_account_partial_reconciled(self, company_id, date_at_object):
         domain = [("max_date", ">", date_at_object), ("company_id", "=", company_id)]
-        fields = ["debit_move_id", "credit_move_id", "amount"]
+        fields = [
+            "debit_move_id",
+            "credit_move_id",
+            "amount",
+            "debit_amount_currency",
+            "credit_amount_currency",
+        ]
         accounts_partial_reconcile = self.env["account.partial.reconcile"].search_read(
             domain=domain, fields=fields
         )
         debit_amount = {}
+        debit_amount_currency = {}
         credit_amount = {}
+        credit_amount_currency = {}
         for account_partial_reconcile_data in accounts_partial_reconcile:
             debit_move_id = account_partial_reconcile_data["debit_move_id"][0]
             credit_move_id = account_partial_reconcile_data["credit_move_id"][0]
             if debit_move_id not in debit_amount.keys():
                 debit_amount[debit_move_id] = 0.0
+                debit_amount_currency[debit_move_id] = 0.0
+            debit_amount_currency[debit_move_id] += account_partial_reconcile_data[
+                "debit_amount_currency"
+            ]
             debit_amount[debit_move_id] += account_partial_reconcile_data["amount"]
             if credit_move_id not in credit_amount.keys():
                 credit_amount[credit_move_id] = 0.0
+                credit_amount_currency[credit_move_id] = 0.0
             credit_amount[credit_move_id] += account_partial_reconcile_data["amount"]
+            credit_amount_currency[credit_move_id] += account_partial_reconcile_data[
+                "credit_amount_currency"
+            ]
             account_partial_reconcile_data.update(
                 {"debit_move_id": debit_move_id, "credit_move_id": credit_move_id}
             )
-        return accounts_partial_reconcile, debit_amount, credit_amount
+        return (
+            accounts_partial_reconcile,
+            debit_amount,
+            credit_amount,
+            debit_amount_currency,
+            credit_amount_currency,
+        )
 
     def _get_move_lines_data(
         self,
@@ -103,19 +153,7 @@ class AgedPartnerBalanceReport(models.AbstractModel):
         domain = self._get_move_lines_domain_not_reconciled(
             company_id, account_ids, partner_ids, only_posted_moves, date_from
         )
-        ml_fields = [
-            "id",
-            "name",
-            "date",
-            "move_id",
-            "journal_id",
-            "account_id",
-            "partner_id",
-            "amount_residual",
-            "date_maturity",
-            "ref",
-            "reconciled",
-        ]
+        ml_fields = self._get_ml_fields()
         line_model = self.env["account.move.line"]
         move_lines = line_model.search_read(domain=domain, fields=ml_fields)
         journals_ids = set()
@@ -127,6 +165,8 @@ class AgedPartnerBalanceReport(models.AbstractModel):
                 acc_partial_rec,
                 debit_amount,
                 credit_amount,
+                debit_amount_currency,
+                credit_amount_currency,
             ) = self._get_account_partial_reconciled(company_id, date_at_object)
             if acc_partial_rec:
                 ml_ids = list(map(operator.itemgetter("id"), move_lines))
@@ -147,6 +187,8 @@ class AgedPartnerBalanceReport(models.AbstractModel):
                     company_id,
                     partner_ids,
                     only_posted_moves,
+                    debit_amount_currency,
+                    credit_amount_currency,
                 )
         move_lines = [
             move_line
@@ -182,7 +224,7 @@ class AgedPartnerBalanceReport(models.AbstractModel):
                 elif not move_line["name"]:
                     ref_label = move_line["ref"]
                 else:
-                    ref_label = move_line["ref"] + str(" - ") + move_line["name"]
+                    ref_label = move_line["ref"] + " - " + move_line["name"]
                 move_line_data.update(
                     {
                         "line_rec": line_model.browse(move_line["id"]),
@@ -221,11 +263,15 @@ class AgedPartnerBalanceReport(models.AbstractModel):
                 "older": 0.0,
             }
         )
+        interval_lines = self.env.context["age_partner_config"].line_ids
+        for interval_line in interval_lines:
+            ml[interval_line] = 0.0
         due_date = ml["due_date"]
         amount = ml["residual"]
         today = date_at_object
         if not due_date or today <= due_date:
             ml["current"] += amount
+            due_date = today
         elif today <= due_date + timedelta(days=30):
             ml["30_days"] += amount
         elif today <= due_date + timedelta(days=60):
@@ -236,6 +282,24 @@ class AgedPartnerBalanceReport(models.AbstractModel):
             ml["120_days"] += amount
         else:
             ml["older"] += amount
+        if due_date:
+            days_difference = abs((today - due_date).days)
+            for index, interval_line in enumerate(interval_lines):
+                lower_limit = (
+                    0 if not index else interval_lines[index - 1].inferior_limit
+                )
+                next_line = (
+                    interval_lines[index] if index < len(interval_lines) else None
+                )
+                interval_range = self._get_values_for_range_intervals(
+                    lower_limit, next_line.inferior_limit
+                )
+                if (
+                    days_difference in interval_range
+                    or days_difference == interval_line.inferior_limit
+                ):
+                    ml[interval_line] += amount
+                    break
 
     def _create_account_list(
         self,
@@ -247,6 +311,7 @@ class AgedPartnerBalanceReport(models.AbstractModel):
         date_at_oject,
     ):
         aged_partner_data = []
+        interval_lines = self.env.context["age_partner_config"].line_ids
         for account in accounts_data.values():
             acc_id = account["id"]
             account.update(
@@ -261,6 +326,8 @@ class AgedPartnerBalanceReport(models.AbstractModel):
                     "partners": [],
                 }
             )
+            for interval_line in interval_lines:
+                account[interval_line] = ag_pb_data[acc_id][interval_line]
             for prt_id in ag_pb_data[acc_id]:
                 if isinstance(prt_id, int):
                     partner = {
@@ -273,6 +340,10 @@ class AgedPartnerBalanceReport(models.AbstractModel):
                         "120_days": ag_pb_data[acc_id][prt_id]["120_days"],
                         "older": ag_pb_data[acc_id][prt_id]["older"],
                     }
+                    for interval_line in interval_lines:
+                        partner[interval_line] = ag_pb_data[acc_id][prt_id][
+                            interval_line
+                        ]
                     if show_move_line_details:
                         move_lines = []
                         for ml in ag_pb_data[acc_id][prt_id]["move_lines"]:
@@ -292,6 +363,7 @@ class AgedPartnerBalanceReport(models.AbstractModel):
 
     @api.model
     def _calculate_percent(self, aged_partner_data):
+        interval_lines = self.env.context["age_partner_config"].line_ids
         for account in aged_partner_data:
             if abs(account["residual"]) > 0.01:
                 total = account["residual"]
@@ -317,6 +389,10 @@ class AgedPartnerBalanceReport(models.AbstractModel):
                         ),
                     }
                 )
+                for interval_line in interval_lines:
+                    account[f"percent_{interval_line.id}"] = abs(
+                        round((account[interval_line] / total) * 100, 2)
+                    )
             else:
                 account.update(
                     {
@@ -328,9 +404,12 @@ class AgedPartnerBalanceReport(models.AbstractModel):
                         "percent_older": 0.0,
                     }
                 )
+                for interval_line in interval_lines:
+                    account[f"percent_{interval_line.id}"] = 0.0
         return aged_partner_data
 
     def _get_report_values(self, docids, data):
+        res = super()._get_report_values(docids, data)
         wizard_id = data["wizard_id"]
         company = self.env["res.company"].browse(data["company_id"])
         company_id = data["company_id"]
@@ -341,12 +420,17 @@ class AgedPartnerBalanceReport(models.AbstractModel):
         date_from = data["date_from"]
         only_posted_moves = data["only_posted_moves"]
         show_move_line_details = data["show_move_line_details"]
+        aged_partner_configuration = self.env[
+            "account.age.report.configuration"
+        ].browse(data["age_partner_config_id"])
         (
             ag_pb_data,
             accounts_data,
             partners_data,
             journals_data,
-        ) = self._get_move_lines_data(
+        ) = self.with_context(
+            age_partner_config=aged_partner_configuration
+        )._get_move_lines_data(
             company_id,
             account_ids,
             partner_ids,
@@ -355,7 +439,9 @@ class AgedPartnerBalanceReport(models.AbstractModel):
             only_posted_moves,
             show_move_line_details,
         )
-        aged_partner_data = self._create_account_list(
+        aged_partner_data = self.with_context(
+            age_partner_config=aged_partner_configuration
+        )._create_account_list(
             ag_pb_data,
             accounts_data,
             partners_data,
@@ -363,15 +449,30 @@ class AgedPartnerBalanceReport(models.AbstractModel):
             show_move_line_details,
             date_at_object,
         )
-        aged_partner_data = self._calculate_percent(aged_partner_data)
-        return {
-            "doc_ids": [wizard_id],
-            "doc_model": "open.items.report.wizard",
-            "docs": self.env["open.items.report.wizard"].browse(wizard_id),
-            "company_name": company.display_name,
-            "currency_name": company.currency_id.name,
-            "date_at": date_at,
-            "only_posted_moves": only_posted_moves,
-            "aged_partner_balance": aged_partner_data,
-            "show_move_lines_details": show_move_line_details,
-        }
+        aged_partner_data = self.with_context(
+            age_partner_config=aged_partner_configuration
+        )._calculate_percent(aged_partner_data)
+        res.update(
+            {
+                "doc_ids": [wizard_id],
+                "doc_model": "aged.partner.balance.report.wizard",
+                "docs": self.env["aged.partner.balance.report.wizard"].browse(
+                    wizard_id
+                ),
+                "company_name": company.display_name,
+                "currency_name": company.currency_id.name,
+                "date_at": date_at,
+                "only_posted_moves": only_posted_moves,
+                "aged_partner_balance": aged_partner_data,
+                "show_move_lines_details": show_move_line_details,
+                "age_partner_config": aged_partner_configuration,
+            }
+        )
+        return res
+
+    def _get_ml_fields(self):
+        return self.COMMON_ML_FIELDS + [
+            "amount_residual",
+            "reconciled",
+            "date_maturity",
+        ]