odoo-addon-account-financial-report 15.0.2.9.2.2__py3-none-any.whl → 15.0.2.10.0__py3-none-any.whl

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,6 +51,7 @@ 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
@@ -66,6 +71,24 @@ class AgedPartnerBalanceReport(models.AbstractModel):
         else:
             ag_pb_data[acc_id]["older"] += residual
             ag_pb_data[acc_id][prt_id]["older"] += residual
+        for index, line in enumerate(interval_lines):
+            next_line = (
+                interval_lines[index + 1] if index + 1 < len(interval_lines) else None
+            )
+            lower_limit = 0 if not index else line.inferior_limit
+            if (
+                due_date
+                and next_line
+                and today > due_date
+                and today >= due_date + timedelta(days=lower_limit)
+                and today < due_date + timedelta(days=next_line.inferior_limit)
+            ):
+                ag_pb_data[acc_id][line] += residual
+                ag_pb_data[acc_id][prt_id][line] += residual
+            if not next_line and due_date:
+                if today >= due_date + timedelta(days=line.inferior_limit):
+                    ag_pb_data[acc_id][line] += residual
+                    ag_pb_data[acc_id][prt_id][line] += residual
         return ag_pb_data
 
     def _get_account_partial_reconciled(self, company_id, date_at_object):
@@ -235,6 +258,9 @@ 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
@@ -251,6 +277,27 @@ class AgedPartnerBalanceReport(models.AbstractModel):
         else:
             ml["older"] += amount
 
+        for index, interval_line in enumerate(interval_lines):
+            next_line = (
+                interval_lines[index + 1] if index + 1 < len(interval_lines) else None
+            )
+            upper_limit = next_line.inferior_limit if next_line else None
+
+            if (
+                due_date
+                and (
+                    next_line
+                    and today > due_date
+                    and today >= due_date + timedelta(days=interval_line.inferior_limit)
+                    and today < due_date + timedelta(days=upper_limit)
+                )
+                or (
+                    not next_line
+                    and today >= due_date + timedelta(days=interval_line.inferior_limit)
+                )
+            ):
+                ml[interval_line] += amount
+
     def _create_account_list(
         self,
         ag_pb_data,
@@ -261,6 +308,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(
@@ -275,6 +323,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 = {
@@ -287,6 +337,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"]:
@@ -306,6 +360,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"]
@@ -331,6 +386,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(
                     {
@@ -342,6 +401,8 @@ 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):
@@ -355,12 +416,12 @@ 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"]
-        (
-            ag_pb_data,
-            accounts_data,
-            partners_data,
-            journals_data,
-        ) = self._get_move_lines_data(
+        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.with_context(
+            age_partner_config=aged_partner_configuration
+        )._get_move_lines_data(
             company_id,
             account_ids,
             partner_ids,
@@ -369,7 +430,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,
@@ -377,7 +440,9 @@ class AgedPartnerBalanceReport(models.AbstractModel):
             show_move_line_details,
             date_at_object,
         )
-        aged_partner_data = self._calculate_percent(aged_partner_data)
+        aged_partner_data = self.with_context(
+            age_partner_config=aged_partner_configuration
+        )._calculate_percent(aged_partner_data)
         return {
             "doc_ids": [wizard_id],
             "doc_model": "open.items.report.wizard",
@@ -388,6 +453,7 @@ class AgedPartnerBalanceReport(models.AbstractModel):
             "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,
         }
 
     def _get_ml_fields(self):

odoo/addons/account_financial_report/report/aged_partner_balance_xlsx.py

@@ -1,6 +1,7 @@
 # Author: Julien Coux
 # Copyright 2016 Camptocamp SA
 # Copyright 2021 Tecnativa - João Marques
+# Copyright 2023 Tecnativa - Carolina Fernandez
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from odoo import _, models
@@ -20,67 +21,84 @@ class AgedPartnerBalanceXslx(models.AbstractModel):
             report_name = report_name + suffix
         return report_name
 
-    def _get_report_columns(self, report):
-        if not report.show_move_line_details:
-            return {
-                0: {"header": _("Partner"), "field": "name", "width": 70},
-                1: {
-                    "header": _("Residual"),
-                    "field": "residual",
-                    "field_footer_total": "residual",
-                    "type": "amount",
-                    "width": 14,
-                },
-                2: {
-                    "header": _("Current"),
-                    "field": "current",
-                    "field_footer_total": "current",
-                    "field_footer_percent": "percent_current",
-                    "type": "amount",
-                    "width": 14,
-                },
-                3: {
-                    "header": _("Age ≤ 30 d."),
-                    "field": "30_days",
-                    "field_footer_total": "30_days",
-                    "field_footer_percent": "percent_30_days",
-                    "type": "amount",
-                    "width": 14,
-                },
-                4: {
-                    "header": _("Age ≤ 60 d."),
-                    "field": "60_days",
-                    "field_footer_total": "60_days",
-                    "field_footer_percent": "percent_60_days",
-                    "type": "amount",
-                    "width": 14,
-                },
-                5: {
-                    "header": _("Age ≤ 90 d."),
-                    "field": "90_days",
-                    "field_footer_total": "90_days",
-                    "field_footer_percent": "percent_90_days",
-                    "type": "amount",
-                    "width": 14,
-                },
-                6: {
-                    "header": _("Age ≤ 120 d."),
-                    "field": "120_days",
-                    "field_footer_total": "120_days",
-                    "field_footer_percent": "percent_120_days",
-                    "type": "amount",
-                    "width": 14,
-                },
-                7: {
-                    "header": _("Older"),
-                    "field": "older",
-                    "field_footer_total": "older",
-                    "field_footer_percent": "percent_older",
-                    "type": "amount",
-                    "width": 14,
-                },
+    def _get_report_columns_without_move_line_details(self, report, column_index):
+        report_columns = {
+            0: {"header": _("Partner"), "field": "name", "width": 70},
+            1: {
+                "header": _("Residual"),
+                "field": "residual",
+                "field_footer_total": "residual",
+                "type": "amount",
+                "width": 14,
+            },
+            2: {
+                "header": _("Current"),
+                "field": "current",
+                "field_footer_total": "current",
+                "field_footer_percent": "percent_current",
+                "type": "amount",
+                "width": 14,
+            },
+        }
+        if not report.age_partner_config_id:
+            report_columns.update(
+                {
+                    3: {
+                        "header": _("Age ≤ 30 d."),
+                        "field": "30_days",
+                        "field_footer_total": "30_days",
+                        "field_footer_percent": "percent_30_days",
+                        "type": "amount",
+                        "width": 14,
+                    },
+                    4: {
+                        "header": _("Age ≤ 60 d."),
+                        "field": "60_days",
+                        "field_footer_total": "60_days",
+                        "field_footer_percent": "percent_60_days",
+                        "type": "amount",
+                        "width": 14,
+                    },
+                    5: {
+                        "header": _("Age ≤ 90 d."),
+                        "field": "90_days",
+                        "field_footer_total": "90_days",
+                        "field_footer_percent": "percent_90_days",
+                        "type": "amount",
+                        "width": 14,
+                    },
+                    6: {
+                        "header": _("Age ≤ 120 d."),
+                        "field": "120_days",
+                        "field_footer_total": "120_days",
+                        "field_footer_percent": "percent_120_days",
+                        "type": "amount",
+                        "width": 14,
+                    },
+                    7: {
+                        "header": _("Older"),
+                        "field": "older",
+                        "field_footer_total": "older",
+                        "field_footer_percent": "percent_older",
+                        "type": "amount",
+                        "width": 14,
+                    },
+                }
+            )
+        for interval in report.age_partner_config_id.line_ids:
+            report_columns[column_index] = {
+                "header": interval.name,
+                "field": interval,
+                "field_footer_total": interval,
+                "field_footer_percent": f"percent_{interval.id}",
+                "type": "amount",
+                "width": 14,
             }
-        return {
+            column_index += 1
+        return report_columns
+
+    def _get_report_columns_with_move_line_details(self, report, column_index):
+        report_columns = {
             0: {"header": _("Date"), "field": "date", "width": 11},
             1: {"header": _("Entry"), "field": "entry", "width": 18},
             2: {"header": _("Journal"), "field": "journal", "width": 8},
@@ -105,52 +123,75 @@ class AgedPartnerBalanceXslx(models.AbstractModel):
                 "type": "amount",
                 "width": 14,
             },
-            9: {
-                "header": _("Age ≤ 30 d."),
-                "field": "30_days",
-                "field_footer_total": "30_days",
-                "field_footer_percent": "percent_30_days",
-                "field_final_balance": "30_days",
-                "type": "amount",
-                "width": 14,
-            },
-            10: {
-                "header": _("Age ≤ 60 d."),
-                "field": "60_days",
-                "field_footer_total": "60_days",
-                "field_footer_percent": "percent_60_days",
-                "field_final_balance": "60_days",
-                "type": "amount",
-                "width": 14,
-            },
-            11: {
-                "header": _("Age ≤ 90 d."),
-                "field": "90_days",
-                "field_footer_total": "90_days",
-                "field_footer_percent": "percent_90_days",
-                "field_final_balance": "90_days",
-                "type": "amount",
-                "width": 14,
-            },
-            12: {
-                "header": _("Age ≤ 120 d."),
-                "field": "120_days",
-                "field_footer_total": "120_days",
-                "field_footer_percent": "percent_120_days",
-                "field_final_balance": "120_days",
-                "type": "amount",
-                "width": 14,
-            },
-            13: {
-                "header": _("Older"),
-                "field": "older",
-                "field_footer_total": "older",
-                "field_footer_percent": "percent_older",
-                "field_final_balance": "older",
+        }
+        if not report.age_partner_config_id:
+            report_columns.update(
+                {
+                    9: {
+                        "header": _("Age ≤ 30 d."),
+                        "field": "30_days",
+                        "field_footer_total": "30_days",
+                        "field_footer_percent": "percent_30_days",
+                        "field_final_balance": "30_days",
+                        "type": "amount",
+                        "width": 14,
+                    },
+                    10: {
+                        "header": _("Age ≤ 60 d."),
+                        "field": "60_days",
+                        "field_footer_total": "60_days",
+                        "field_footer_percent": "percent_60_days",
+                        "field_final_balance": "60_days",
+                        "type": "amount",
+                        "width": 14,
+                    },
+                    11: {
+                        "header": _("Age ≤ 90 d."),
+                        "field": "90_days",
+                        "field_footer_total": "90_days",
+                        "field_footer_percent": "percent_90_days",
+                        "field_final_balance": "90_days",
+                        "type": "amount",
+                        "width": 14,
+                    },
+                    12: {
+                        "header": _("Age ≤ 120 d."),
+                        "field": "120_days",
+                        "field_footer_total": "120_days",
+                        "field_footer_percent": "percent_120_days",
+                        "field_final_balance": "120_days",
+                        "type": "amount",
+                        "width": 14,
+                    },
+                    13: {
+                        "header": _("Older"),
+                        "field": "older",
+                        "field_footer_total": "older",
+                        "field_footer_percent": "percent_older",
+                        "field_final_balance": "older",
+                        "type": "amount",
+                        "width": 14,
+                    },
+                }
+            )
+        for interval in report.age_partner_config_id.line_ids:
+            report_columns[column_index] = {
+                "header": interval.name,
+                "field": interval,
+                "field_footer_total": interval,
+                "field_footer_percent": f"percent_{interval.id}",
                 "type": "amount",
                 "width": 14,
-            },
-        }
+            }
+            column_index += 1
+        return report_columns
+
+    def _get_report_columns(self, report):
+        if not report.show_move_line_details:
+            return self._get_report_columns_without_move_line_details(
+                report, column_index=3
+            )
+        return self._get_report_columns_with_move_line_details(report, column_index=9)
 
     def _get_report_filters(self, report):
         return [