diff --git a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py index 0953f90f8..917e501c9 100644 --- a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py @@ -59,7 +59,7 @@ class YuthonOnboardApproval(models.Model): related_issues_id = fields.Many2one('issue.library', string="关联议题") # 合同 is_office = fields.Boolean(string='是否领用办公物品', default=False) - structure_type_id = fields.Many2one('hr.payroll.structure.type', string='工资结构类型', readonly=True) + structure_type_id = fields.Many2one('hr.payroll.structure.type', string='工资结构类型') is_annual_salary = fields.Boolean(string="是否年薪") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') diff --git a/yuthon_property_approval/wizard/property_reconciliation_wizard.py b/yuthon_property_approval/wizard/property_reconciliation_wizard.py index 83efb3496..e6a17a36c 100644 --- a/yuthon_property_approval/wizard/property_reconciliation_wizard.py +++ b/yuthon_property_approval/wizard/property_reconciliation_wizard.py @@ -129,8 +129,8 @@ class PropertyReconciliationWizard(models.Model): ('lessee_id', '=', first_line.tenant_id.id), ('is_reconciliation', '=', False), ('is_suspend', '=', False), - ('due_date', '>=', first_day_str), - ('due_date', '<=', last_day_str), + ('due_date', '>=', first_day), + ('due_date', '<=', last_day), ] # 如果有物业信息 if line.property_id: