[FIX] budget_control: carry forward

budget_control/models/analytic_account.py

@@ -166,14 +166,23 @@ def _find_next_analytic(self, next_date_range):
 
     def _update_val_analytic(self, next_analytic, next_date_range):
         BudgetPeriod = self.env["budget.period"]
+        vals_update = {}
         type_id = next_analytic.budget_period_id.plan_date_range_type_id
         period_id = BudgetPeriod.search(
             [
                 ("bm_date_from", "=", next_date_range),
                 ("plan_date_range_type_id", "=", type_id.id),
             ]
         )
-        return {"budget_period_id": period_id.id}
+        if period_id:
+            vals_update = {"budget_period_id": period_id.id}
+        else:
+            # No budget period found, update date_from and date_to
+            vals_update = {
+                "bm_date_from": next_date_range,
+                "bm_date_to": next_analytic.bm_date_to + relativedelta(years=1),
+            }
+        return vals_update
 
     def _auto_create_next_analytic(self, next_date_range):
         self.ensure_one()
@@ -183,17 +192,44 @@ def _auto_create_next_analytic(self, next_date_range):
         next_analytic.write(val_update)
         return next_analytic
 
-    def next_year_analytic(self, auto_create=True):
+    @api.model
+    def _get_analytic_date(self, analytic_account, order):
+        """
+        Finds the minimum or maximum date of an analytic account.
+
+        :param analytic_account: Analytic account record
+        :param order: The order to search for the earliest or latest date
+        :return: The earliest or latest date found, or None if no records
+        """
+
+        # Access the analytic line model
+        AnalyticAccount = self.env["account.analytic.account"]
+
+        # Construct the domain to search for the specific analytic account
+        domain = [('id', 'in', [analytic_id for analytic_id, _ in analytic_account.items()])]
+        # Perform the search
+        result = AnalyticAccount.search(domain, order=order, limit=1)
+
+        # Return the date if a record is found, else None
+        return result
+
+    @api.model
+    def next_year_analytic(self, analytic_distribution, auto_create=True):
         """Find next analytic from analytic date_to + 1,
         if bm_date_to = False, this is an open end analytic, always return False"""
-        self.ensure_one()
-        if not self.bm_date_to:
-            return False
-        next_date_range = self.bm_date_to + relativedelta(days=1)
-        next_analytic = self._find_next_analytic(next_date_range)
-        if not next_analytic and auto_create:
-            next_analytic = self._auto_create_next_analytic(next_date_range)
-        return next_analytic
+        next_analytic_distribution = {}
+        for analytic_id, aa_percent in analytic_distribution.items():
+            analytic = self.browse(int(analytic_id))
+            # Use same analytic
+            if not analytic.bm_date_to:
+                next_analytic_distribution[str(analytic_id)] = aa_percent
+                continue
+            next_date_range = analytic.bm_date_to + relativedelta(days=1)
+            next_analytic = analytic._find_next_analytic(next_date_range)
+            if not next_analytic and auto_create:
+                next_analytic = analytic._auto_create_next_analytic(next_date_range)
+            next_analytic_distribution[str(next_analytic.id)] = aa_percent
+        return next_analytic_distribution
 
     def _check_budget_control_status(self, budget_period_id=False):
         """Warning for budget_control on budget_period, but not in controlled"""

budget_control/models/budget_commit_forward.py

@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import _, api, fields, models
-from odoo.exceptions import UserError
+from odoo.exceptions import UserError, ValidationError
 
 
 class BudgetCommitForward(models.Model):
@@ -63,7 +63,7 @@ def _compute_missing_analytic(self):
         for rec in self:
             rec.missing_analytic = any(
                 rec.forward_line_ids.filtered_domain(
-                    [("to_analytic_account_id", "=", False)]
+                    [("to_analytic_distribution", "=", False)]
                 )
             )
 
@@ -98,32 +98,30 @@ def _prepare_vals_forward(self, docs, res_model):
             analytic_account = (
                 doc.fwd_analytic_distribution or doc[doc._budget_analytic_field]
             )
-            # 1 line document can multi analytic, This function will split analytic
-            for analytic_id, aa_percent in analytic_account.items():
-                analytic = AnalyticAccount.browse(int(analytic_id))
-                method_type = False
-                to_analytic_account_id = False
-                if analytic.bm_date_to and analytic.bm_date_to < self.to_date_commit:
-                    method_type = "new"
-                    to_analytic_account_id = analytic.next_year_analytic(
-                        auto_create=False
-                    )
-                value_dict.append(
-                    {
-                        "forward_id": self.id,
-                        "analytic_account_id": analytic_id,
-                        "analytic_percent": aa_percent,
-                        "method_type": method_type,
-                        "res_model": res_model,
-                        "res_id": doc.id,
-                        "document_id": "{},{}".format(doc._name, doc.id),
-                        "document_number": self._get_document_number(doc),
-                        "to_analytic_account_id": to_analytic_account_id.id,
-                        # Total amount commit from each analytic account
-                        "amount_commit": doc.amount_commit * aa_percent / 100,
-                        "date_commit": doc.fwd_date_commit or doc.date_commit,
-                    }
-                )
+            # Get analytic min date
+            analytic_min_date = AnalyticAccount._get_analytic_date(analytic_account, "bm_date_to asc")
+            method_type = False
+            to_analytic_account_id = False
+            if analytic_min_date.bm_date_to and analytic_min_date.bm_date_to < self.to_date_commit:
+                method_type = "new"
+
+                # to_analytic_account_id = analytic.next_year_analytic(
+                #     auto_create=False
+                # )
+            value_dict.append(
+                {
+                    "forward_id": self.id,
+                    "analytic_distribution": analytic_account,
+                    "method_type": method_type,
+                    "res_model": res_model,
+                    "res_id": doc.id,
+                    "document_id": "{},{}".format(doc._name, doc.id),
+                    "document_number": self._get_document_number(doc),
+                    "to_analytic_distribution": {},
+                    "amount_commit": doc.amount_commit,
+                    "date_commit": doc.fwd_date_commit or doc.date_commit,
+                }
+            )
         return value_dict
 
     def action_review_budget_commit(self):
@@ -142,12 +140,13 @@ def get_budget_commit_forward(self, res_model):
             Line.create(vals)
 
     def create_missing_analytic(self):
+        AnalyticAccount = self.env["account.analytic.account"]
         for rec in self:
             for line in rec.forward_line_ids.filtered_domain(
-                [("to_analytic_account_id", "=", False)]
+                [("to_analytic_distribution", "=", False)]
             ):
-                line.to_analytic_account_id = (
-                    line.analytic_account_id.next_year_analytic()
+                line.to_analytic_distribution = (
+                    AnalyticAccount.next_year_analytic(line.analytic_distribution)
                 )
 
     def preview_budget_commit_forward_info(self):
@@ -185,13 +184,13 @@ def _get_forward_initial_commit(self, domain):
         self.ensure_one()
         forwards = self.env["budget.commit.forward.line"].read_group(
             domain,
-            ["to_analytic_account_id", "amount_commit"],
-            ["to_analytic_account_id"],
-            orderby="to_analytic_account_id",
-        )
+            ["to_analytic_distribution", "amount_commit"],
+            ["to_analytic_distribution"],
+            orderby="to_analytic_distribution",
+        )        
         res = [
             {
-                "analytic_account_id": f["to_analytic_account_id"][0],
+                "analytic_distribution": f["to_analytic_distribution"],
                 "initial_commit": f["amount_commit"],
             }
             for f in forwards
@@ -201,7 +200,7 @@ def _get_forward_initial_commit(self, domain):
     def _do_forward_commit(self, reverse=False):
         """Create carry forward budget move to all related documents"""
         self = self.sudo()
-        _analytic_field = "analytic_account_id" if reverse else "to_analytic_account_id"
+        _analytic_field = "analytic_distribution" if reverse else "to_analytic_distribution"
         for rec in self:
             group_document = {}
             # Group by document
@@ -297,6 +296,7 @@ def action_draft(self):
 
 class BudgetCommitForwardLine(models.Model):
     _name = "budget.commit.forward.line"
+    _inherit = "analytic.mixin"
     _description = "Budget Commit Forward Line"
 
     forward_id = fields.Many2one(
@@ -307,16 +307,6 @@ class BudgetCommitForwardLine(models.Model):
         readonly=True,
         ondelete="cascade",
     )
-    analytic_account_id = fields.Many2one(
-        comodel_name="account.analytic.account",
-        index=True,
-        required=True,
-        readonly=True,
-    )
-    analytic_percent = fields.Float(
-        required=True,
-        readonly=True,
-    )
     method_type = fields.Selection(
         selection=[
             ("new", "New"),
@@ -326,16 +316,14 @@ class BudgetCommitForwardLine(models.Model):
         help="New: if the analytic has ended, 'To Analytic Account' is required\n"
         "Extended: if the analytic has ended, but want to extend to next period date end",
     )
-    to_analytic_account_id = fields.Many2one(
-        comodel_name="account.analytic.account",
-        string="Forward to Analytic",
-        compute="_compute_to_analytic_account_id",
+    to_analytic_distribution = fields.Json(
+        string="To Analytic",
+        compute="_compute_to_analytic_distribution",
         store=True,
-        readonly=True,
     )
     bm_date_to = fields.Date(
-        related="analytic_account_id.bm_date_to",
-        readonly=True,
+        string="Date To",
+        compute="_compute_bm_date_to",
     )
     res_model = fields.Selection(
         selection=[],
@@ -374,30 +362,40 @@ class BudgetCommitForwardLine(models.Model):
         readonly=True,
     )
 
+    @api.depends("analytic_distribution")
+    def _compute_bm_date_to(self):
+        AnalyticAccount = self.env["account.analytic.account"]
+        for rec in self:
+            analytic_min_date = AnalyticAccount._get_analytic_date(rec.analytic_distribution, "bm_date_to asc")
+            rec.bm_date_to = analytic_min_date.bm_date_to
+
     @api.depends("method_type")
-    def _compute_to_analytic_account_id(self):
+    def _compute_to_analytic_distribution(self):
+        AnalyticAccount = self.env["account.analytic.account"]
         for rec in self:
-            if not rec.analytic_account_id:
+            if not rec.analytic_distribution:
                 continue
+            analytic_min_date = AnalyticAccount._get_analytic_date(rec.analytic_distribution, "bm_date_to asc")
+
             # Case analytic has no end date, always use same analytic
-            if not rec.analytic_account_id.bm_date_to:
-                rec.to_analytic_account_id = rec.analytic_account_id
+            if not analytic_min_date.bm_date_to:
+                rec.to_analytic_distribution = rec.analytic_distribution
                 rec.method_type = False
                 continue
             # Case analytic has extended end date that cover new commit date, use same analytic
             if (
-                rec.analytic_account_id.bm_date_to
-                and rec.analytic_account_id.bm_date_to >= rec.forward_id.to_date_commit
+                analytic_min_date.bm_date_to
+                and analytic_min_date.bm_date_to >= rec.forward_id.to_date_commit
             ):
-                rec.to_analytic_account_id = rec.analytic_account_id
+                rec.to_analytic_distribution = rec.analytic_distribution
                 rec.method_type = "extend"
                 continue
             # Case want to extend analytic to end of next budget period
             if rec.method_type == "extend":
-                rec.to_analytic_account_id = rec.analytic_account_id
+                rec.to_analytic_distribution = rec.analytic_distribution
                 continue
             # Case want to use next analytic, if exists
             if rec.method_type == "new":
-                rec.to_analytic_account_id = rec.analytic_account_id.next_year_analytic(
-                    auto_create=False
+                rec.to_analytic_distribution = AnalyticAccount.next_year_analytic(
+                    rec.analytic_distribution, auto_create=False
                 )

budget_control/views/budget_commit_forward_view.xml

@@ -22,22 +22,15 @@
         <field name="arch" type="xml">
             <tree editable="bottom" create="0">
                 <field name="document_id" invisible="1" />
-                <field name="analytic_account_id" />
-                <field name="analytic_percent" />
-                <field name="bm_date_to" invisible="1" />
+                <field name="analytic_distribution" widget="analytic_distribution" />
+                <field name="bm_date_to" optional="hide" />
                 <field
                     name="method_type"
                     optional="show"
                     attrs="{'required': [('bm_date_to', '!=', False)],
                             'readonly': [('bm_date_to', '=', False)]}"
                 />
-                <field
-                    name="to_analytic_account_id"
-                    force_save="1"
-                    options="{'no_create': 1}"
-                    optional="show"
-                    readonly="1"
-                />
+                <field name="to_analytic_distribution" widget="analytic_distribution" optional="show" />
                 <field name="document_number" optional="show" />
                 <field name="date_commit" />
                 <field name="currency_id" invisible="1" />
@@ -53,10 +46,10 @@
                 <group>
                     <group>
                         <field name="document_id" invisible="1" />
-                        <field name="analytic_account_id" />
+                        <field name="analytic_distribution" />
                         <field name="bm_date_to" invisible="1" />
                         <field name="method_type" />
-                        <field name="to_analytic_account_id" />
+                        <field name="to_analytic_distribution" />
                     </group>
                     <group>
                         <field name="document_number" />

budget_control/wizards/budget_commit_forward_info.py

@@ -32,6 +32,7 @@ def action_budget_commit_forward(self):
 
 class BudgetCommitForwardInfoLine(models.TransientModel):
     _name = "budget.commit.forward.info.line"
+    _inherit = "analytic.mixin"
     _description = "Budget Commitment Forward Info Line"
 
     forward_info_id = fields.Many2one(
@@ -41,35 +42,30 @@ class BudgetCommitForwardInfoLine(models.TransientModel):
         readonly=True,
         ondelete="cascade",
     )
-    analytic_account_id = fields.Many2one(
-        string="Forward to Analytic",
-        comodel_name="account.analytic.account",
-        readonly=True,
-    )
-    analytic_plan = fields.Many2one(
-        comodel_name="account.analytic.plan",
-        related="analytic_account_id.plan_id",
-        readonly=True,
-    )
-    initial_available = fields.Monetary(
-        string="Initial Available",
-        related="analytic_account_id.initial_available",
-        readonly=True,
-    )
+    # analytic_plan = fields.Many2one(
+    #     comodel_name="account.analytic.plan",
+    #     related="analytic_account_id.plan_id",
+    #     readonly=True,
+    # )
+    # initial_available = fields.Monetary(
+    #     string="Initial Available",
+    #     related="analytic_account_id.initial_available",
+    #     readonly=True,
+    # )
     initial_commit = fields.Monetary(
         string="Initial Commitment",
         readonly=True,
     )
-    amount_balance = fields.Monetary(
-        string="Available",
-        compute="_compute_amount_balance",
-    )
+    # amount_balance = fields.Monetary(
+    #     string="Available",
+    #     compute="_compute_amount_balance",
+    # )
     currency_id = fields.Many2one(
         comodel_name="res.currency",
         related="forward_info_id.currency_id",
         readonly=True,
     )
 
-    def _compute_amount_balance(self):
-        for rec in self:
-            rec.amount_balance = rec.initial_available - rec.initial_commit
+    # def _compute_amount_balance(self):
+    #     for rec in self:
+    #         rec.amount_balance = rec.initial_available - rec.initial_commit