diff --git a/yuthon_notice/views/yuthon_notice_views.xml b/yuthon_notice/views/yuthon_notice_views.xml index 25538e09c..b905bc132 100644 --- a/yuthon_notice/views/yuthon_notice_views.xml +++ b/yuthon_notice/views/yuthon_notice_views.xml @@ -164,14 +164,14 @@ diff --git a/yuthon_salary/models/inherit_hr_payroll_structure.py b/yuthon_salary/models/inherit_hr_payroll_structure.py index 2bbdecbc6..c289f9ad0 100644 --- a/yuthon_salary/models/inherit_hr_payroll_structure.py +++ b/yuthon_salary/models/inherit_hr_payroll_structure.py @@ -17,12 +17,15 @@ class HrPayrollStructure(models.Model): currency_id = fields.Many2one("res.currency", string="货币", required=True, default=lambda self: self.env.company.currency_id) + base_salary = fields.Monetary(string="基本工资", currency_field="currency_id") rank_salary = fields.Monetary(string="职级工资", currency_field="currency_id") performance_bonus = fields.Monetary(string="绩效奖金", currency_field="currency_id") communication_subsidy = fields.Monetary(string="通讯补贴", currency_field="currency_id") position_salary = fields.Monetary(string="岗位工资", currency_field="currency_id") + position_subsidy = fields.Monetary(string="岗位补贴", currency_field="currency_id") seniority_salary = fields.Monetary(string="工龄工资", currency_field="currency_id") overtime_pay = fields.Monetary(string="加班费", currency_field="currency_id") + integrated_subsidy = fields.Monetary(string="综合补贴", currency_field="currency_id") full_attendance_bonus = fields.Monetary(string="全勤奖", currency_field="currency_id") @api.model diff --git a/yuthon_salary/views/yuthon_payroll_project_views.xml b/yuthon_salary/views/yuthon_payroll_project_views.xml index 21c819187..2dcac4d23 100644 --- a/yuthon_salary/views/yuthon_payroll_project_views.xml +++ b/yuthon_salary/views/yuthon_payroll_project_views.xml @@ -81,7 +81,7 @@ - +