Merge PR #517 into 18.0

Signed-off-by Saran440

Author: Saran440

budget_control_request_document/models/budget_period.py

@@ -42,3 +42,22 @@ def _get_eligible_budget_period(self, date=False, doc_type=False):
                 or (not bp.control_budget and bp.request_document)
             )
         return budget_period
+
+    @api.model
+    def check_budget_precommit(self, doclines, doc_type="account"):
+        """Uncommit request document first before check budget"""
+        budget_moves = False
+        if (
+            hasattr(doclines, "_doc_rel")
+            and hasattr(doclines[doclines._doc_rel], "request_document_id")
+            and doclines[doclines._doc_rel].request_document_id
+        ):
+            budget_moves = (
+                doclines[doclines._doc_rel]
+                .request_document_id.with_context(reverse_precommit=1)
+                .uncommit_request_budget(doclines)
+            )
+        res = super().check_budget_precommit(doclines, doc_type=doc_type)
+        if budget_moves:
+            budget_moves.unlink()
+        return res

budget_control_request_document/models/request_document.py

@@ -78,6 +78,7 @@ def recompute_budget_move(self):
 
     def close_budget_move(self):
         rounding = self.currency_id.rounding
+        budget_moves = self.env["request.budget.move"]
         for rec in self:
             totals = rec.budget_move_ids.read(["debit", "credit"])
             debit = sum(x["debit"] for x in totals)
@@ -103,7 +104,9 @@ def close_budget_move(self):
                     if line.id in line_amount_map
                     else {}
                 )
-                line.with_context(**ctx).commit_budget(reverse=True)
+                budget_move = line.with_context(**ctx).commit_budget(reverse=True)
+                budget_moves += budget_move
+        return budget_moves
 
     def uncommit_request_budget(self, request_line):
-        return
+        return False

budget_control_request_document/models/request_order.py

@@ -17,7 +17,8 @@ def recompute_budget_move(self):
         self.mapped("line_ids").recompute_budget_move()
 
     def close_budget_move(self):
-        self.mapped("line_ids").close_budget_move()
+        budget_moves = self.mapped("line_ids").close_budget_move()
+        return budget_moves
 
     def _clear_date_commit(self, doclines):
         clear_date_commit = {"date_commit": False}

budget_control_request_document/tests/request_document_tester.py

@@ -46,7 +46,8 @@ def uncommit_request_budget(self, request_line):
             and budget_move
             and request_line[request_line._doc_rel].state == "posted"
         ):
-            self.close_budget_move()
+            budget_moves = self.close_budget_move()
+            return budget_moves
         return res
 
     def _create_tester(self):

budget_control_request_document/tests/test_budget_control_request_document.py

@@ -13,7 +13,7 @@
 
 
 @tagged("post_install", "-at_install")
-class TestBudgetControlRequestDocument(get_budget_common_class()):
+class TestBudgetControlRequest(get_budget_common_class()):
     @classmethod
     @freeze_time("2001-02-01")
     def setUpClass(cls):

budget_control_request_document/views/request_order_view.xml

@@ -11,7 +11,7 @@
                     name="budget_commit"
                     invisible="not budget_move_ids"
                 >
-                    <div class="oe_read_only oe_right" name="buttons">
+                    <div class="d-flex justify-content-end" name="buttons">
                         <button
                             type="object"
                             name="recompute_budget_move"