diff --git a/yuthon_contract/models/inherit_hr_contract.py b/yuthon_contract/models/inherit_hr_contract.py index e259f2352..ed0612499 100644 --- a/yuthon_contract/models/inherit_hr_contract.py +++ b/yuthon_contract/models/inherit_hr_contract.py @@ -19,7 +19,6 @@ class HrContract(models.Model): ('attendance', 'Attendances'), ('planning', '特殊排版')]) is_probation = fields.Boolean(string="试用期") - wage = fields.Float(string="基本工资", compute='_compute_wage', store=True) start_date = fields.Date(string="开始日期", required=True, default=fields.Date.today) end_date = fields.Date(string="结束日期", required=True, default=lambda self: fields.Date.today() + relativedelta(months=+3)) @@ -43,14 +42,6 @@ class HrContract(models.Model): else: record.name = ' ' - @api.depends('structure_type_id') - def _compute_wage(self): - for record in self: - if record.structure_type_id and record.yuthon_company: - wage_id = self.env['hr.salary.rule'].search([('struct_id', '=', record.structure_type_id.default_struct_id.id), - ('yuthon_company', '=', record.yuthon_company), ('name', '=', '基本工资')]) - if wage_id: - record.wage = wage_id.amount_fix def action_hr_contract(self): return { diff --git a/yuthon_contract/views/inherit_hr_contract_views.xml b/yuthon_contract/views/inherit_hr_contract_views.xml index 888a17ab5..07c77f0ba 100644 --- a/yuthon_contract/views/inherit_hr_contract_views.xml +++ b/yuthon_contract/views/inherit_hr_contract_views.xml @@ -42,6 +42,9 @@ 工作日历 + + 1 + diff --git a/yuthon_salary/models/inherit_hr_payslip.py b/yuthon_salary/models/inherit_hr_payslip.py index e7267880e..39e126cc1 100644 --- a/yuthon_salary/models/inherit_hr_payslip.py +++ b/yuthon_salary/models/inherit_hr_payslip.py @@ -46,13 +46,16 @@ class InheritHrPayslip(models.Model): housing_provident_fund = fields.Float(string='住房公积金', compute='_compute_salary', store=True) b_year = fields.Float(string='企业(职业)年金', compute='_compute_salary', store=True) total_before_tax = fields.Float(string='本期应收', compute='_compute_total_before_tax', store=True) - year_compute = fields.Float(string='年度清算', compute='_compute_salary', store=True) - year_jie = fields.Float(string='年度结余', compute='_compute_salary', store=True) - year_gong = fields.Float(string='年功奖', compute='_compute_salary', store=True) - study_on = fields.Float(string='学习进步奖', compute='_compute_salary', store=True) - jing_te = fields.Float(string='经营特别奖', compute='_compute_salary', store=True) + total_before_tax = fields.Float(string='税前合计', compute='_compute_total_before_tax', store=True) + year_compute = fields.Float(string='年度清算') + year_jie = fields.Float(string='年度结余') + year_gong = fields.Float(string='年功奖') + study_on = fields.Float(string='学习进步奖') + jing_te = fields.Float(string='经营特别奖') + temporary_performance_bonus = fields.Float(string='临时绩效奖') attendance_deduction_total = fields.Float(string='考勤扣款合计') assessment_reserved_amount = fields.Float(string='考核保留量') + reimburse_performance_bonus = fields.Float(string='上个月多扣绩效补回') is_push = fields.Boolean(string='推送') is_salary_push = fields.Boolean(string='工资推送') @@ -117,16 +120,6 @@ class InheritHrPayslip(models.Model): rec.work_injury_insurance = line.total if line.name == '住房公积金': rec.housing_provident_fund = line.total - if line.name == '年度清算': - rec.year_compute = line.total - if line.name == '年度结余': - rec.year_jie = line.total - if line.name == '年功奖': - rec.year_gong = line.total - if line.name == '学习进步奖': - rec.study_on = line.total - if line.name == '经营特别奖': - rec.jing_te = line.total def put_payslip(self): diff --git a/yuthon_salary/views/inherit_hr_payslip_views.xml b/yuthon_salary/views/inherit_hr_payslip_views.xml index 94a127882..bf6c7b2bb 100644 --- a/yuthon_salary/views/inherit_hr_payslip_views.xml +++ b/yuthon_salary/views/inherit_hr_payslip_views.xml @@ -49,6 +49,7 @@ +