!3303 !3302 添加功能

Merge pull request !3303 from 李鹏宇/dev

yuthon_salary/models/inherit_hr_payslip.py

@@ -108,6 +108,8 @@ class InheritHrPayslip(models.Model):
     seniority_allowance = fields.Float(string='工龄补贴')
     safety_subsidy = fields.Float(string='安全生产管理补贴')
     job_performance = fields.Float(string='岗位绩效')
+    leave_allowance = fields.Float(string='请假扣款/补发')
+    comprehensive_subsidy = fields.Float(string='综合补贴')
     excellent_employees = fields.Float(string='优秀部门经理/员工奖励')
     duty = fields.Float(string='值班（含节日加班）')
     annuity = fields.Float(string='年金')
@@ -145,10 +147,18 @@ class InheritHrPayslip(models.Model):
         for rec in self:
             if rec.line_ids:
                 for line in rec.line_ids:
+                    if line.name == '值班费':
+                        rec.duty_fee = line.total
+                    if line.name == '综合补贴':
+                        rec.comprehensive_subsidy = line.total
+                    if line.name == '安全生产管理补贴':
+                        rec.safety_subsidy = line.total
                     if line.name == '职级工资':
                         rec.rank_salary = line.total
                     if line.name == '岗位补贴':
                         rec.position_subsidy = line.total
+                    if line.name == '工龄补贴':
+                        rec.seniority_allowance = line.total
                     if line.name == '岗位工资':
                         rec.position_salary = line.total
                     if line.name == '基本工资':

yuthon_salary/models/yuthon_payroll_project.py

@@ -230,9 +230,12 @@ class YuthonPayrollInsurances (models.Model):
                     if ins.company_id.name == '天河物管':
                         code = 'WGQYNJ'
                         formula_salary = "result = 0.0 if employee.total_coefficients == 0 else round((employee.converted/employee.total_coefficients * employee.calculation_totals * 0.08 * 0.5)/12, 2)"
-                    else:
+                    elif ins.company_id.name == '集团本部':
                         code = 'QYNJ'
                         formula_salary = "result = round((employee.last_year_salary * 0.02), 0)"
+                    else:
+                        code = 'LCQYNJ'
+                        formula_salary = "result = round((employee.last_year_salary * 0.02), 2)"
                 if ins.name not in sal.rule_ids.mapped('name'):
                     rule_list.append([0, 0, {
                         'name': ins.name,

yuthon_salary/views/inherit_hr_payslip_views.xml

@@ -43,6 +43,7 @@
                 <field name="actual_salary" decoration-danger="1" decoration-bf="1" optional="show"/>
                 <field name="total_before_tax" decoration-danger="1" decoration-bf="1" optional="show"/>
                 <field name="b_year" decoration-danger="1" decoration-bf="1" optional="show"/>
+                <field name="leave_allowance" groups="yuthon_salary.group_wg_user" optional="show"/>
                 <field name="three_one" optional="show"/>
                 <field name="tax_payable" decoration-danger="1" decoration-bf="1" readonly="1" optional="show"/>
                  <field name="union_dues" decoration-danger="1" decoration-bf="1" optional="show" groups="yuthon_salary.group_jtbb_user"/>
@@ -51,6 +52,7 @@
                 <field name="performance_bonuses" required="1" optional="show" groups="yuthon_salary.group_jtbb_user"/>
                 <field name="seniority_allowance" decoration-success="1" groups="yuthon_salary.group_wg_user" optional="show"/>
                 <field name="safety_subsidy" decoration-success="1" groups="yuthon_salary.group_wg_user" optional="show"/>
+                <field name="comprehensive_subsidy" decoration-success="1" groups="yuthon_salary.group_wg_user" optional="show"/>
                 <field name="job_performance" decoration-success="1" groups="yuthon_salary.group_wg_user" optional="show"/>
                 <field name="excellent_employees" decoration-success="1" groups="yuthon_salary.group_wg_user" optional="show"/>
                 <field name="duty" decoration-success="1" groups="yuthon_salary.group_wg_user" optional="show"/>
@@ -64,8 +66,8 @@
                 <field name="post_salary"  required="1"  decoration-success="1" groups="yuthon_salary.group_jtbb_user" optional="show"/>
                 <field name="seniority_salary" required="1" decoration-success="1" groups="yuthon_salary.group_jtbb_user" optional="show"/>
                 <field name="commuting_allowance" required="1" decoration-success="1" groups="yuthon_salary.group_jtbb_user" optional="show"/>
-                <field name="full_attendance_award" decoration-success="1" groups="yuthon_salary.group_jtbb_user" optional="show"/>
-                <field name="overtime_pay"  decoration-success="1" groups="yuthon_salary.group_jtbb_user" optional="show"/>
+                <field name="full_attendance_award" decoration-success="1" groups="yuthon_salary.group_jtbb_user, yuthon_salary.group_wg_user" optional="show"/>
+                <field name="overtime_pay"  decoration-success="1" groups="yuthon_salary.group_jtbb_user, yuthon_salary.group_wg_user" optional="show"/>
                 <field name="meal_misunderstanding_fee"  decoration-success="1" groups="yuthon_salary.group_jtbb_user" optional="show"/>
                 <field name="condolence_fund"  decoration-success="1" groups="yuthon_salary.group_wg_user, yuthon_salary.group_jtbb_user" optional="show"/>
                 <field name="retroactive_allowance" decoration-success="1" groups="yuthon_salary.group_jtbb_user" optional="show"/>
@@ -235,6 +237,7 @@
                 <field name="total_before_tax" decoration-danger="1" decoration-bf="1" optional="show"/>
                 <field name="b_year" decoration-danger="1" decoration-bf="1" optional="show"/>
                 <field name="three_one" optional="show"/>
+                <field name="leave_allowance" groups="yuthon_salary.group_wg_user" optional="show"/>
                 <field name="tax_payable" decoration-danger="1" decoration-bf="1" readonly="1" optional="show"/>
                  <field name="union_dues" decoration-danger="1" decoration-bf="1" optional="show" groups="yuthon_salary.group_jtbb_user, yuthon_salary.group_lc_user"/>
                 <field name="base_salary" required="1" optional="show"/>
@@ -242,6 +245,7 @@
                 <field name="performance_bonuses" required="1" optional="show" groups="yuthon_salary.group_jtbb_user"/>
                 <field name="seniority_allowance" decoration-success="1" groups="yuthon_salary.group_wg_user" optional="show"/>
                 <field name="safety_subsidy" decoration-success="1" groups="yuthon_salary.group_wg_user" optional="show"/>
+                <field name="comprehensive_subsidy" decoration-success="1" groups="yuthon_salary.group_wg_user" optional="show"/>
                 <field name="job_performance" decoration-success="1" groups="yuthon_salary.group_wg_user" optional="show"/>
                 <field name="excellent_employees" decoration-success="1" groups="yuthon_salary.group_wg_user" optional="show"/>
                 <field name="duty" decoration-success="1" groups="yuthon_salary.group_wg_user" optional="show"/>
@@ -255,8 +259,8 @@
                 <field name="high_subsidy" decoration-success="1" groups="yuthon_salary.group_lc_user" optional="show"/>
                 <field name="seniority_salary" required="1" decoration-success="1" groups="yuthon_salary.group_jtbb_user" optional="show"/>
                 <field name="commuting_allowance" required="1" decoration-success="1" groups="yuthon_salary.group_jtbb_user" optional="show"/>
-                <field name="full_attendance_award" decoration-success="1" groups="yuthon_salary.group_jtbb_user" optional="show"/>
-                <field name="overtime_pay"  decoration-success="1" groups="yuthon_salary.group_jtbb_user" optional="show"/>
+                <field name="full_attendance_award" decoration-success="1" groups="yuthon_salary.group_jtbb_user, yuthon_salary.group_wg_user" optional="show"/>
+                <field name="overtime_pay"  decoration-success="1" groups="yuthon_salary.group_jtbb_user, yuthon_salary.group_wg_user" optional="show"/>
                 <field name="meal_misunderstanding_fee"  decoration-success="1" groups="yuthon_salary.group_jtbb_user" optional="show"/>
                 <field name="condolence_fund"  decoration-success="1" groups="yuthon_salary.group_wg_user, yuthon_salary.group_jtbb_user" optional="show"/>
                 <field name="retroactive_allowance" decoration-success="1" groups="yuthon_salary.group_jtbb_user" optional="show"/>