diff --git a/yuthon_hr_employee_approval/models/yuthon_message_login.py b/yuthon_hr_employee_approval/models/yuthon_message_login.py
index 7c1dc7ce2..e051c5e57 100644
--- a/yuthon_hr_employee_approval/models/yuthon_message_login.py
+++ b/yuthon_hr_employee_approval/models/yuthon_message_login.py
@@ -126,7 +126,6 @@ class YuthonMessageLogin(models.Model):
part_time_ids = fields.One2many('education.details.line1', 'diploma_id', string="学历证(非全日制)")
degree_id_ids = fields.One2many('education.details.line2', 'degree_id', string="学位证")
certificate_ids = fields.One2many('certificates.detail.line', 'certificate_id', string="专业证书")
- self_users_ids = fields.Many2many('res.users', string="当前经办人")
@api.onchange('is_issues')
def _onchange_is_issues(self):
@@ -164,7 +163,7 @@ class EducationalDetailsLine(models.Model):
diploma_id = fields.Many2one('yuthon.message.login', string="关联个人信息")
graduation_id = fields.Many2one('ir.attachment', string="毕业证书")
- validation_reports = fields.Char(string="验证报告")
+ validation_reports = fields.Many2one('ir.attachment', string="验证报告")
class EducationalDetailsLine1(models.Model):
@@ -173,7 +172,7 @@ class EducationalDetailsLine1(models.Model):
diploma_id = fields.Many2one('yuthon.message.login', string="关联个人信息")
graduation_id = fields.Many2one('ir.attachment', string="毕业证书")
- validation_reports = fields.Char(string="验证报告")
+ validation_reports = fields.Many2one('ir.attachment', string="验证报告")
class EducationalDetailsLine2(models.Model):
diff --git a/yuthon_hr_employee_approval/views/yuthon_message_login_views.xml b/yuthon_hr_employee_approval/views/yuthon_message_login_views.xml
index 9e45a7bba..14898000b 100644
--- a/yuthon_hr_employee_approval/views/yuthon_message_login_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_message_login_views.xml
@@ -237,14 +237,14 @@
-
+
-
+
diff --git a/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml
index 3e31cea0a..65bf466fe 100644
--- a/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml
@@ -6,6 +6,7 @@
+
diff --git a/yuthon_property_approval/models/property_lease_contract.py b/yuthon_property_approval/models/property_lease_contract.py
index f0b118bed..0776aea67 100644
--- a/yuthon_property_approval/models/property_lease_contract.py
+++ b/yuthon_property_approval/models/property_lease_contract.py
@@ -1344,6 +1344,8 @@ class PropertyLeaseContract(models.Model):
})
def choose_property_button(self):
+ address_ids = self.lease_ids.mapped('address_id').filtered(lambda r: r)
+ property_ids2 = address_ids.ids
return {
"type": "ir.actions.act_window",
"name": "批量选择物业信息",
@@ -1352,6 +1354,7 @@ class PropertyLeaseContract(models.Model):
"target": "new",
"context": {
'default_lease_contract_id': self.id,
+ 'default_property_ids': property_ids2,
}
}
diff --git a/yuthon_property_approval/views/property_lease_contract.xml b/yuthon_property_approval/views/property_lease_contract.xml
index 2c1160797..cbb13afb6 100644
--- a/yuthon_property_approval/views/property_lease_contract.xml
+++ b/yuthon_property_approval/views/property_lease_contract.xml
@@ -39,7 +39,7 @@
invisible="condition != 'cancel'"/>
-
+
@@ -49,7 +49,7 @@
-
+
@@ -69,14 +69,14 @@
-
+
-
+
-
-
-
+
+
+
@@ -759,6 +759,9 @@
property.lease.contract
+
diff --git a/yuthon_property_approval/wizard/choose_contract_wizard_views.xml b/yuthon_property_approval/wizard/choose_contract_wizard_views.xml
index 6a4164f01..70f3814df 100644
--- a/yuthon_property_approval/wizard/choose_contract_wizard_views.xml
+++ b/yuthon_property_approval/wizard/choose_contract_wizard_views.xml
@@ -9,7 +9,8 @@
-
+
+
diff --git a/yuthon_property_approval/wizard/choose_property_wizard.py b/yuthon_property_approval/wizard/choose_property_wizard.py
index 3d824d344..1eb960384 100644
--- a/yuthon_property_approval/wizard/choose_property_wizard.py
+++ b/yuthon_property_approval/wizard/choose_property_wizard.py
@@ -5,7 +5,18 @@ class ChoosePropertyWizard(models.Model):
_name = 'choose.property.wizard'
lease_contract_id = fields.Many2one('property.lease.contract', string="合同")
- property_ids = fields.Many2many('yuthon.property', string="物业信息")
+ property_ids2 = fields.Many2many(
+ 'yuthon.property',
+ 'choose_property_wizard_property_ids2_rel',
+ 'wizard_id', 'property_id',
+ string="已选物业",
+ readonly=True
+ )
+ property_ids = fields.Many2many(
+ 'yuthon.property',
+ string="物业信息",
+ )
+
def confirm(self):
rec = self.lease_contract_id
diff --git a/yuthon_salary/models/inherit_hr_payslip.py b/yuthon_salary/models/inherit_hr_payslip.py
index aede2ae97..90337530b 100644
--- a/yuthon_salary/models/inherit_hr_payslip.py
+++ b/yuthon_salary/models/inherit_hr_payslip.py
@@ -67,7 +67,7 @@ class InheritHrPayslip(models.Model):
year_gong = fields.Float(string='年功奖', store=True)
study_on = fields.Float(string='学习进步奖')
jing_te = fields.Float(string='经营特别奖')
- temporary_performance_bonus = fields.Float(string='临时绩效奖金')
+ temporary_performance_bonus = fields.Float(string='临时绩效奖')
last_year_safety = fields.Float(string='上年安全生产工作奖')
last_year_jie = fields.Float(string='上年年度结余')
last_year_performance_evaluation = fields.Float(string='上年绩效评优')
@@ -199,7 +199,10 @@ class InheritHrPayslip(models.Model):
'total_unit_part',
'total_personal_part',
'total_payable',
- 'one_medical_insurance_payable'
+ 'one_medical_insurance_payable',
+ 'performance_deduction',
+ 'commuting_deduction',
+ 'base_salary_deduction'
]
for field in fields_to_process:
if field in values: