diff --git a/yuthon_approval/models/inherit_approval_category.py b/yuthon_approval/models/inherit_approval_category.py index a54c7a139..db92f3d58 100644 --- a/yuthon_approval/models/inherit_approval_category.py +++ b/yuthon_approval/models/inherit_approval_category.py @@ -13,7 +13,7 @@ class ApprovalCategory(models.Model): category_start_date = fields.Date(string="开始日期", default=fields.Date.today()) category_end_date = fields.Date(string="结束日期") - approval_type = fields.Selection( + new_approval_type = fields.Selection( string='审批分类', selection=[('business', '业务单据'), ('oa', 'OA审批'), @@ -22,7 +22,7 @@ class ApprovalCategory(models.Model): def unlink(self): for res in self: - if res.biote_approval_type == 'business' or res.biote_approval_type == 'branch': + if res.new_approval_type == 'business' or res.new_approval_type == 'branch': raise UserError('不允许删除业务/分支审批!') return super(ApprovalCategory, self).unlink() diff --git a/yuthon_approval/views/inherit_approval_category_views.xml b/yuthon_approval/views/inherit_approval_category_views.xml index 52dbd0b16..3b9036725 100644 --- a/yuthon_approval/views/inherit_approval_category_views.xml +++ b/yuthon_approval/views/inherit_approval_category_views.xml @@ -19,6 +19,7 @@ + @@ -28,7 +29,7 @@ - [('approval_type', '=', 'oa')] + [('new_approval_type', '=', 'oa')] \ No newline at end of file