From 81bebf836d725fe49650431bd85c2850f6209988 Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Thu, 2 Jan 2025 10:59:03 +0800 Subject: [PATCH] =?UTF-8?q?sf-=E9=87=87=E8=B4=AD-=E8=AF=A2=E4=BB=B7?= =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=E6=B5=81=E8=BD=AC=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=BD=B1=E5=93=8D=E7=8E=B0=E6=9C=89=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jikimo_purchase_tier_validation/__manifest__.py | 2 +- jikimo_purchase_tier_validation/models/models.py | 4 ++++ jikimo_purchase_tier_validation/views/views.xml | 12 ++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/jikimo_purchase_tier_validation/__manifest__.py b/jikimo_purchase_tier_validation/__manifest__.py index 18a63e80..91dcbb49 100644 --- a/jikimo_purchase_tier_validation/__manifest__.py +++ b/jikimo_purchase_tier_validation/__manifest__.py @@ -20,7 +20,7 @@ 'version': '0.1', # any module necessary for this one to work correctly - 'depends': ['purchase', 'base_tier_validation', 'documents', 'purchase_request', 'account'], + 'depends': ['purchase', 'base_tier_validation', 'documents', 'purchase_request', 'account', 'purchase_order_approved'], # always loaded 'data': [ diff --git a/jikimo_purchase_tier_validation/models/models.py b/jikimo_purchase_tier_validation/models/models.py index e5a80f7b..5a581980 100644 --- a/jikimo_purchase_tier_validation/models/models.py +++ b/jikimo_purchase_tier_validation/models/models.py @@ -23,6 +23,10 @@ class jikimo_purchase_tier_validation(models.Model): for record in self: if record.need_validation and record.validation_status != 'validated': raise ValidationError(_('此操作需要至少对一条记录进行审批。\n请发起审批申请。')) + if record.state in ['to approve']: + raise ValidationError(_('请先完成审批。')) + if record.state == 'approved': + record.state = 'purchase' return super().button_confirm() # def button_confirm(self): diff --git a/jikimo_purchase_tier_validation/views/views.xml b/jikimo_purchase_tier_validation/views/views.xml index ca82e729..b651e914 100644 --- a/jikimo_purchase_tier_validation/views/views.xml +++ b/jikimo_purchase_tier_validation/views/views.xml @@ -1,11 +1,23 @@ + + tier_validation_view_approved_purchase_order_form_inherit + purchase.order + + + + + + + tier_validation_view_purchase_order_form_inherit purchase.order + +