From 84854bcfecae058b902f3b90ca9e92fae38ae4b8 Mon Sep 17 00:00:00 2001 From: Saran440 Date: Thu, 12 Oct 2023 14:12:43 +0700 Subject: [PATCH 1/2] [FIX] control_budget: not change date --- budget_control_contract/models/__init__.py | 1 - .../models/base_budget_move.py | 20 ------------------- 2 files changed, 21 deletions(-) delete mode 100644 budget_control_contract/models/base_budget_move.py diff --git a/budget_control_contract/models/__init__.py b/budget_control_contract/models/__init__.py index 685023fd..a945ee98 100644 --- a/budget_control_contract/models/__init__.py +++ b/budget_control_contract/models/__init__.py @@ -1,6 +1,5 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from . import base_budget_move from . import contract_budget_move from . import budget_period from . import contract diff --git a/budget_control_contract/models/base_budget_move.py b/budget_control_contract/models/base_budget_move.py deleted file mode 100644 index 11bd60eb..00000000 --- a/budget_control_contract/models/base_budget_move.py +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2022 Ecosoft Co., Ltd. (http://ecosoft.co.th) -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -from odoo import models - - -class BudgetDoclineMixin(models.AbstractModel): - _inherit = "budget.docline.mixin" - - def _update_budget_commitment(self, budget_vals, reverse=False): - """Update date is not range in analytic account""" - self.ensure_one() - budget_vals = super()._update_budget_commitment(budget_vals, reverse) - if self._budget_model() == "contract.budget.move": - if ( - budget_vals["date"] <= self.analytic_account_id.bm_date_from - or budget_vals["date"] >= self.analytic_account_id.bm_date_to - ): - budget_vals["date"] = self.analytic_account_id.bm_date_from - return budget_vals From 7700a17f874db654a0ca914cdfa66bcf2a6e8435 Mon Sep 17 00:00:00 2001 From: Saran440 Date: Mon, 16 Oct 2023 10:17:12 +0700 Subject: [PATCH 2/2] [FIX] condition button revision budget plan --- budget_plan_revision/views/budget_plan_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/budget_plan_revision/views/budget_plan_view.xml b/budget_plan_revision/views/budget_plan_view.xml index 8d3a185c..030799b1 100644 --- a/budget_plan_revision/views/budget_plan_view.xml +++ b/budget_plan_revision/views/budget_plan_view.xml @@ -48,7 +48,7 @@ class="oe_highlight" string="New Revision" type="object" - attrs="{'invisible': ['|', ('budget_control_count', '=', 0), ('state', '!=', 'done')]}" + states="done" confirm="This operation cannot be undone. Are you sure to continue?" />