Accept Merge Request #1698: (feature/消息提醒优化 -> develop)
Merge Request: 询价单审批 Created By: @管欢 Reviewed By: @胡尧 Approved By: @胡尧 Accepted By: @管欢 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1698?initial=true
This commit is contained in:
@@ -72,8 +72,30 @@ class jikimo_purchase_tier_validation(models.Model):
|
|||||||
message_type='notification',
|
message_type='notification',
|
||||||
subtype_xmlid='mail.mt_note'
|
subtype_xmlid='mail.mt_note'
|
||||||
)
|
)
|
||||||
|
res = super(jikimo_purchase_tier_validation, self).request_validation()
|
||||||
|
self.state = 'to approve'
|
||||||
|
return res
|
||||||
|
|
||||||
return super(jikimo_purchase_tier_validation, self).request_validation()
|
def restart_validation(self):
|
||||||
|
res = super(jikimo_purchase_tier_validation, self).restart_validation()
|
||||||
|
self.state = 'draft'
|
||||||
|
return res
|
||||||
|
|
||||||
|
def _validate_tier(self, tiers=False):
|
||||||
|
res = super(jikimo_purchase_tier_validation, self)._validate_tier(tiers)
|
||||||
|
self.state = 'approved'
|
||||||
|
return res
|
||||||
|
|
||||||
|
def _rejected_tier(self, tiers=False):
|
||||||
|
res = super(jikimo_purchase_tier_validation, self)._rejected_tier(tiers)
|
||||||
|
self.state = 'draft'
|
||||||
|
return res
|
||||||
|
|
||||||
|
@api.model
|
||||||
|
def _get_under_validation_exceptions(self):
|
||||||
|
res = super(jikimo_purchase_tier_validation, self)._get_under_validation_exceptions()
|
||||||
|
res.append("state")
|
||||||
|
return res
|
||||||
|
|
||||||
# 上传合同文件
|
# 上传合同文件
|
||||||
def upload_contract_file(self):
|
def upload_contract_file(self):
|
||||||
|
|||||||
Reference in New Issue
Block a user