pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!3209 !3208 添加功能

Browse Source 
Merge pull request !3209 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2025-06-10 09:20:55 +00:00
committed by Gitee
parent 020ed9aaf1 669f8e8d20
commit e767d9cc91
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_employee_approval/views/yuthon_interview_approval_views.xml
+1 -1
View File
@@ -8,7 +8,7 @@
<field name="name"/>
<field name="code"/>
<field name="job_id"/>
<field name="department_id" widget="ztree_select"/>
<field name="department_id"/>
</tree>
</field>
</record>
yuthon_salary/models/inherit_hr_payslip_run.py
+1 -1
View File
@@ -15,7 +15,7 @@ class InheritHrPayslipRun(models.Model):
string="阶段")
def Fileline(self):
domain = [('is_salary_push', '=', True), ('is_salary_release', '=', True)]
domain = [('is_salary_push', '=', True), ('is_salary_release', '=', True), ('payslip_run_id', '=', self.id)]
return {
"name": "薪资归档明细",
'type': 'ir.actions.act_window',
yuthon_salary/views/inherit_hr_payslip_views.xml
+13 -10
View File
@@ -11,6 +11,9 @@
<attribute name="default_order">employee_id</attribute>
<attribute name="limit">20</attribute>
</xpath>
<xpath expr="//tree" position="after">
<button name="all_put_release" type="object" string="推送" class="oe_highlight"/>
</xpath>
<xpath expr="//field[@name='employee_id']" position="attributes">
<attribute name="widget">false</attribute>
<attribute name="options">"{'no_open': True}"</attribute>
@@ -228,9 +231,9 @@
</header>
<field name="employee_id" string="姓名" options="{'no_open': True}" decoration-danger="is_bold" decoration-bf="is_bold"/>
<field name="date_of_entry" optional="show"/>
<field name="struct_id" string="职级" optional="show"/>
<field name="bank_account_id" optional="show"/>
<field name="actual_salary" decoration-danger="1" decoration-bf="1" optional="show"/>
<field name="struct_id" string="职级" optional="show" column_invisible="1"/>
<field name="bank_account_id" optional="show" column_invisible="1"/>
<field name="actual_salary" decoration-danger="1" decoration-bf="1" optional="show" column_invisible="1"/>
<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"/>
@@ -266,14 +269,14 @@
<field name="housing_provident_fund" decoration-info="1" optional="show"/>
<field name="work_injury_insurance" decoration-info="1" optional="show"/>
<field name="specialized_deduction" decoration-warning="1" optional="show"/>
<field name="infant_care" decoration-warning="1" optional="show"/>
<field name="child_education" decoration-warning="1" optional="show"/>
<field name="elderly_support" decoration-warning="1" optional="show"/>
<field name="housing_loan_interest" decoration-warning="1" optional="show"/>
<field name="housing_rent" decoration-warning="1" optional="show"/>
<field name="continuing_education" decoration-warning="1" optional="show"/>
<field name="infant_care" decoration-warning="1" optional="show" column_invisible="1"/>
<field name="child_education" decoration-warning="1" optional="show" column_invisible="1"/>
<field name="elderly_support" decoration-warning="1" optional="show" column_invisible="1"/>
<field name="housing_loan_interest" decoration-warning="1" optional="show" column_invisible="1"/>
<field name="housing_rent" decoration-warning="1" optional="show" column_invisible="1"/>
<field name="continuing_education" decoration-warning="1" optional="show" column_invisible="1"/>
<field name="individual_tax_refund" decoration-danger="1" optional="show"/>
<field name="temporary_performance_bonus" decoration-danger="1" optional="show"/>
<field name="temporary_performance_bonus" decoration-danger="1" optional="show" column_invisible="1"/>
<field name="social_security" decoration-danger="1" optional="show"/>
<field name="liquidation_year" decoration-danger="1" optional="show" groups="yuthon_salary.group_jtbb_user"/>
<field name="year_compute" decoration-danger="1" optional="show" groups="yuthon_salary.group_jtbb_user"/>