[18.0][FIX] budget_control: required analytic without display

budget_control/__manifest__.py

@@ -3,7 +3,7 @@
 
 {
     "name": "Budget Control",
-    "version": "18.0.1.6.0",
+    "version": "18.0.1.6.1",
     "category": "Accounting",
     "license": "AGPL-3",
     "author": "Ecosoft, Odoo Community Association (OCA)",

budget_control/models/base_budget_move.py

@@ -535,26 +535,28 @@ def _check_required_analytic(self):
         Required all document except
             - move that check 'Not Affect Budget'
             - move that have 'Tax'
-            - display_type is not false
+            - section/note line (display_type set), i.e. not a real product line
         """
         required_analytic = self.env.user.has_group(
             "budget_control.group_required_analytic"
         )
+        # A real budget line requires an analytic account; section/note lines don't.
+        # - account.move.line flags real lines with display_type == "product"
+        # - other doclines (purchase, sale, ...) use a falsy display_type for real
+        #   lines, and some (hr.expense, purchase.request.line) have no display_type
+        #   field at all -> the line is always a real product line.
+        if self._name == "account.move.line":
+            is_product_line = self.display_type == "product"
+        else:
+            is_product_line = not getattr(self, "display_type", False)
         return (
             required_analytic
             and not self[self._budget_analytic_field]
             and not (
                 self._name == "account.move.line"
                 and (self.move_id.not_affect_budget or self.tax_line_id)
             )
-            # Account move line with display_type is not False
-            # but purchase, sale or other module don't have display_type if selected
-            # product in line
-            and (
-                self._name == "account.move.line"
-                and self.display_type == "product"
-                or (hasattr(self, "display_type") and not self.display_type)
-            )
+            and is_product_line
         )
 
     def commit_budget(self, reverse=False, **vals):

budget_control/tests/test_budget_control.py

@@ -1072,3 +1072,77 @@ def test_24_commit_cross_currency_blocked(self):
             UserError, "All companies sharing a budget must use the same currency."
         ):
             bill_c.action_post()
+
+    @freeze_time("2001-02-01")
+    def test_25_required_analytic_setting(self):
+        """'Required Analytic Account' setting enforces analytic on doclines.
+
+        * account.move.line: only product lines are enforced; section / note
+          lines are skipped (they are not product lines).
+        * a docline with NO display_type field (budget.move.adjustment.item,
+          same shape as PR / EX / AV) must also be enforced.
+
+        Regression guard: a previous ``hasattr(self, "display_type")`` check made
+        the requirement silently skip every docline whose model lacks the field
+        (PR, EX, AV), letting those documents commit without an analytic account.
+        """
+        # Enable the "Required Analytic Account" setting for the current user.
+        required_group = self.env.ref("budget_control.group_required_analytic")
+        self.env.user.groups_id = [Command.link(required_group.id)]
+        self.assertTrue(
+            self.env.user.has_group("budget_control.group_required_analytic")
+        )
+        analytic_distribution = {self.costcenter1.id: 100}
+
+        # account.move.line product line, no analytic -> blocked (Required)
+        bill_no_aa = self._create_simple_bill(False, self.account_kpi1, 100)
+        with self.assertRaisesRegex(UserError, "Please fill analytic account."):
+            bill_no_aa.action_post()
+
+        # account.move.line product line, with analytic -> posts (Not Required)
+        bill_aa = self._create_simple_bill(
+            analytic_distribution, self.account_kpi1, 100
+        )
+        bill_aa.action_post()
+        self.assertEqual(bill_aa.state, "posted")
+
+        # account.move.line: only product lines are enforced; everything else
+        # on the move is skipped (Not Required).
+        AML = self.env["account.move.line"]
+        # section / note lines are not product lines
+        self.assertFalse(
+            AML.new({"display_type": "line_section"})._check_required_analytic()
+        )
+        self.assertFalse(
+            AML.new({"display_type": "line_note"})._check_required_analytic()
+        )
+        # line on a "Not Affect Budget" move
+        naf_move = self.env["account.move"].new({"not_affect_budget": True})
+        self.assertFalse(
+            AML.new(
+                {"display_type": "product", "move_id": naf_move.id}
+            )._check_required_analytic()
+        )
+        # tax line
+        tax = self.env["account.tax"].new({})
+        self.assertFalse(
+            AML.new(
+                {"display_type": "product", "tax_line_id": tax.id}
+            )._check_required_analytic()
+        )
+
+        # Docline with NO display_type field (PR / EX / AV shape) -> must enforce
+        self.assertNotIn(
+            "display_type",
+            self.env["budget.move.adjustment.item"]._fields,
+            "Fixture model must have no display_type field",
+        )
+        budget_adjust = self.BudgetAdjust.create({"date_commit": "2001-02-01"})
+        with Form(budget_adjust.adjust_item_ids) as line:
+            line.adjust_id = budget_adjust
+            line.adjust_type = "consume"
+            line.product_id = self.product1
+            line.amount = 100.0  # no analytic_distribution on purpose
+        line.save()
+        with self.assertRaisesRegex(UserError, "Please fill analytic account."):
+            budget_adjust.action_adjust()