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 + +