添加功能
This commit is contained in:
@@ -63,6 +63,7 @@ class InheritHrPayslip(models.Model):
|
||||
total_before_tax = fields.Float(string='本期应收', compute='_compute_total_before_tax', store=True)
|
||||
year_compute = fields.Float(string='前年年度清算', store=True)
|
||||
year_jie = fields.Float(string='前年年度结余', store=True)
|
||||
children_welfare_fee = fields.Float(string='六一儿童节福利')
|
||||
year_gong = fields.Float(string='年功奖', store=True)
|
||||
study_on = fields.Float(string='学习进步奖')
|
||||
jing_te = fields.Float(string='经营特别奖')
|
||||
@@ -253,6 +254,10 @@ class InheritHrPayslip(models.Model):
|
||||
for rec in self:
|
||||
if rec.line_ids:
|
||||
for line in rec.line_ids:
|
||||
if line.name == '六一儿童节福利':
|
||||
rec.children_welfare_fee = line.total
|
||||
if line.name == '儿童节慰问金':
|
||||
rec.condolence_fund = line.total
|
||||
if line.name == '春节福利':
|
||||
rec.spring_festival = line.total
|
||||
if line.name == '上年社保补缴':
|
||||
@@ -450,11 +455,12 @@ class InheritHrPayslip(models.Model):
|
||||
'performance_deduction', 'commuting_deduction', 'retroactive_insurance',
|
||||
'base_salary_deduction', 'last_year_performance_evaluation', 'safety_subsidy', 'job_performance',
|
||||
'distribution_part', 'minus_att', 'add_att', 'spring_festival',
|
||||
'duty', 'monthly_overtime', 'annuity', 'excellent_employees',
|
||||
'duty', 'monthly_overtime', 'annuity', 'excellent_employees', 'condolence_fund',
|
||||
'retention_previous_year')
|
||||
def _compute_total_before_tax(self):
|
||||
for record in self:
|
||||
record.total_before_tax = (
|
||||
record.condolence_fund +
|
||||
record.spring_festival +
|
||||
record.liquidation_year +
|
||||
record.add_att +
|
||||
@@ -500,7 +506,7 @@ class InheritHrPayslip(models.Model):
|
||||
# 本期应收 - 三险一金 - 年金 - 应补退税 - 工会会费 - 个税退回
|
||||
# total_before_tax - three_one - b_year - union_dues - tax_payable - individual_tax_refund
|
||||
@api.depends('total_before_tax', 'three_one', 'b_year', 'union_dues', 'tax_payable', 'individual_tax_refund',
|
||||
'medical_fee', 'individual_income_tax', 'add_income_tax', 'minus_annuity_difference',
|
||||
'medical_fee', 'individual_income_tax', 'add_income_tax', 'minus_annuity_difference', 'children_welfare_fee',
|
||||
'add_annuity_difference')
|
||||
def _compute_actual_salary(self):
|
||||
for record in self:
|
||||
@@ -512,6 +518,7 @@ class InheritHrPayslip(models.Model):
|
||||
record.union_dues -
|
||||
record.tax_payable -
|
||||
record.individual_income_tax +
|
||||
record.children_welfare_fee +
|
||||
record.add_income_tax +
|
||||
record.minus_annuity_difference +
|
||||
record.individual_tax_refund +
|
||||
|
||||
@@ -95,6 +95,8 @@ class YuthonPayrollCommon(models.Model):
|
||||
formula_salary = "result = 0"
|
||||
if ins.name == '环境作业津贴':
|
||||
formula_salary = "result = 0"
|
||||
if ins.name == '儿童节慰问金':
|
||||
formula_salary = "result = 0"
|
||||
if ins.name == '春节福利' and ins.company_id.name == '天河物管':
|
||||
formula_salary = "result = 680 if employee.salary_month == '1' and employee.department_id.name != '领导班子' else 0"
|
||||
if ins.name == '质检员津贴':
|
||||
|
||||
@@ -276,7 +276,8 @@
|
||||
<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="children_welfare_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" optional="show"/>
|
||||
<field name="retroactive_allowance" decoration-success="1" groups="yuthon_salary.group_jtbb_user" optional="show"/>
|
||||
<field name="last_duty" decoration-success="1" groups="yuthon_salary.group_lc_user" optional="show"/>
|
||||
<field name="excellent_employees" decoration-success="1" groups="yuthon_salary.group_wg_user" optional="show"/>
|
||||
|
||||
Reference in New Issue
Block a user