diff --git a/room/report/room_booking_agenda_template.xml b/room/report/room_booking_agenda_template.xml
index 527f917a2..24f5139b9 100644
--- a/room/report/room_booking_agenda_template.xml
+++ b/room/report/room_booking_agenda_template.xml
@@ -42,7 +42,7 @@
会议时间：
- 年月日星期 上午下午时分
+ 年月日 星期 上午下午时分
@@ -106,14 +106,8 @@
-
-
- 否
-
-
-
- 是
-
+ 是
+ 否
|
diff --git a/yuthon_contract/models/inherit_hr_contract.py b/yuthon_contract/models/inherit_hr_contract.py
index ec8a75d5f..823274761 100644
--- a/yuthon_contract/models/inherit_hr_contract.py
+++ b/yuthon_contract/models/inherit_hr_contract.py
@@ -89,6 +89,7 @@ class HrContract(models.Model):
compute="_compute_is_company",
search="_search_part_of_company",
)
+ change_ids = fields.One2many('hr.contract.change.line', 'contract_id', string="异动信息")
def update_version(self):
contract_ids = self.env["hr.contract"].browse(
@@ -418,3 +419,16 @@ class HrContract(models.Model):
})
return contracts
+
+
+class HrContractChangeLine(models.Model):
+ _name = 'hr.contract.change.line'
+ _description = '异动信息明细行'
+
+ contract_id = fields.Many2one('hr.contract', string="关联合同")
+ department_id = fields.Many2one('hr.department', string="部门")
+ job_id = fields.Many2one('hr.job', string="工作岗位")
+ structure_type_id = fields.Many2one('hr.payroll.structure.type', string="工资结构类型")
+ salary_group_id = fields.Many2one('yuthon.salary.group', string="工资单分组")
+ change_start_date = fields.Date(string="开始日期")
+ change_end_date = fields.Date(string="结束日期")
diff --git a/yuthon_contract/security/ir.model.access.csv b/yuthon_contract/security/ir.model.access.csv
index a41277ec0..c49d6728e 100644
--- a/yuthon_contract/security/ir.model.access.csv
+++ b/yuthon_contract/security/ir.model.access.csv
@@ -1,5 +1,6 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_yuthon_contract_wizard,yuthon.contract.wizard,model_yuthon_contract_wizard,,1,1,1,1
+access_hr_contract_change_line,hr.contract.change.line,model_hr_contract_change_line,,1,1,1,1
diff --git a/yuthon_contract/views/inherit_hr_contract_views.xml b/yuthon_contract/views/inherit_hr_contract_views.xml
index 51eb9c8c8..827e17fa5 100644
--- a/yuthon_contract/views/inherit_hr_contract_views.xml
+++ b/yuthon_contract/views/inherit_hr_contract_views.xml
@@ -87,7 +87,7 @@
工作日历
- 1
+ 0
@@ -108,16 +108,24 @@
乙方信息
-
-
-
-
-
-
-
-
-
-
+
+ 1
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yuthon_property_approval/views/property_lease_contract.xml b/yuthon_property_approval/views/property_lease_contract.xml
index 8440aa0f6..37dab2e8a 100644
--- a/yuthon_property_approval/views/property_lease_contract.xml
+++ b/yuthon_property_approval/views/property_lease_contract.xml
@@ -54,8 +54,9 @@
租赁合同审批
-
-
+
+
+
@@ -63,43 +64,49 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -179,7 +186,7 @@
-
+
@@ -190,6 +197,7 @@
style="max-width: 3rem !important;"/>日
+