diff --git a/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py b/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py index 73f54e568..32a651cd0 100644 --- a/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py @@ -24,6 +24,7 @@ class YuthonRenewalApproval(models.Model): work_end = fields.Boolean(string="结束") employee_id = fields.Many2one('hr.employee', string="续签员工") + contract_signing_entity = fields.Char(string="合同签约主体") card = fields.Char(related='employee_id.identification_id', string="身份证号") department1_id = fields.Many2one('hr.department', string="续签部门") user_sex = fields.Selection(related='employee_id.user_sex', string="性别") diff --git a/yuthon_hr_employee_approval/views/yuthon_renewal_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_renewal_approval_views.xml index fce41df32..3810f02e1 100644 --- a/yuthon_hr_employee_approval/views/yuthon_renewal_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_renewal_approval_views.xml @@ -60,6 +60,7 @@ + diff --git a/yuthon_property/models/property_bank_statements.py b/yuthon_property/models/property_bank_statements.py index 8cbccb18d..d4ec33881 100644 --- a/yuthon_property/models/property_bank_statements.py +++ b/yuthon_property/models/property_bank_statements.py @@ -227,6 +227,7 @@ class ReceivableModifyLine(models.Model): is_penalty = fields.Boolean(string='是否为违约金') not_collected = fields.Float(string='未收') amount = fields.Float(string='已对金额') + has_date = fields.Date(related='receivable_id.has_date', string='退款日期', store=False) penalty_pay_line_ids = fields.Many2many( 'penalty.pay.line', diff --git a/yuthon_property/views/property_bank_statements_views.xml b/yuthon_property/views/property_bank_statements_views.xml index 79d917b97..db025ca5b 100644 --- a/yuthon_property/views/property_bank_statements_views.xml +++ b/yuthon_property/views/property_bank_statements_views.xml @@ -129,6 +129,7 @@ +