diff --git a/yuthon_hr_employee_approval/models/contract_review_approval.py b/yuthon_hr_employee_approval/models/contract_review_approval.py index adf6e1f8e..df8920d11 100644 --- a/yuthon_hr_employee_approval/models/contract_review_approval.py +++ b/yuthon_hr_employee_approval/models/contract_review_approval.py @@ -16,6 +16,10 @@ class ContractReviewApproval(models.Model): department_id = fields.Many2one('hr.department', string='送审部门') amount = fields.Float(string='合同金额') remarks = fields.Text(string='情况说明') + purchase_type = fields.Selection( + [('fixed', '固定资产'), ('low', '低值易耗'), ('service', '服务'), ('day', '日常消耗品')], + string="采购类型", required=True, default='fixed') + documents_ids = fields.Many2many('ir.attachment', string="附件") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') diff --git a/yuthon_hr_employee_approval/views/contract_review_approval_views.xml b/yuthon_hr_employee_approval/views/contract_review_approval_views.xml index 5d67a19e1..b1f3e9283 100644 --- a/yuthon_hr_employee_approval/views/contract_review_approval_views.xml +++ b/yuthon_hr_employee_approval/views/contract_review_approval_views.xml @@ -51,6 +51,7 @@ + diff --git a/yuthon_property/data/yuthon_new_property.xml b/yuthon_property/data/yuthon_new_property.xml index 9ab1c244e..72ec96269 100644 --- a/yuthon_property/data/yuthon_new_property.xml +++ b/yuthon_property/data/yuthon_new_property.xml @@ -44,7 +44,7 @@ 定时任务:更新电表停用状态 code - model.update_ele_state + model.update_ele_state() 1 @@ -57,7 +57,7 @@ 定时任务:更新水表停用状态 code - model.update_water_state + model.update_water_state() 1 diff --git a/yuthon_trade/views/yuthon_business_approval_viwes.xml b/yuthon_trade/views/yuthon_business_approval_viwes.xml index 1a53f58e6..041dde8f3 100644 --- a/yuthon_trade/views/yuthon_business_approval_viwes.xml +++ b/yuthon_trade/views/yuthon_business_approval_viwes.xml @@ -46,13 +46,13 @@ - + + + + - - -