Merge pull request !3936 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2025-07-19 07:42:53 +00:00
committed by Gitee
@@ -18,6 +18,12 @@
<xpath expr="//field[@name='basic_wage']" position="attributes">
<attribute name="column_invisible">1</attribute>
</xpath>
<xpath expr="//field[@name='date_from']" position="attributes">
<attribute name="column_invisible">1</attribute>
</xpath>
<xpath expr="//field[@name='date_to']" position="attributes">
<attribute name="column_invisible">1</attribute>
</xpath>
<xpath expr="//field[@name='gross_wage']" position="attributes">
<attribute name="column_invisible">1</attribute>
</xpath>
@@ -29,12 +35,6 @@
</xpath>
<xpath expr="//field[@name='payslip_run_id']" position="attributes">
<attribute name="column_invisible">1</attribute>
</xpath>
<xpath expr="//field[@name='date_from']" position="attributes">
<attribute name="column_invisible">1</attribute>
</xpath>
<xpath expr="//field[@name='date_to']" position="attributes">
<attribute name="column_invisible">1</attribute>
</xpath>
<xpath expr="//field[@name='number']" position="attributes">
<attribute name="column_invisible">1</attribute>
@@ -137,7 +137,7 @@
</record>
<record id="hr_payroll_inherit_form" model="ir.ui.view">
<field name="name">hr.payroll.inherit.form</field>
<field name="model">hr.payslip</field>d
<field name="model">hr.payslip</field>
<field name="inherit_id" ref="hr_payroll.view_hr_payslip_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='company_id']" position="after">
@@ -164,6 +164,12 @@
<xpath expr="//field[@name='payslip_run_id']" position="attributes">
<attribute name="string">工资批次</attribute>
</xpath>
<xpath expr="//field[@name='date_from']" position="attributes">
<attribute name="column_invisible">1</attribute>
</xpath>
<xpath expr="//field[@name='date_to']" position="attributes">
<attribute name="column_invisible">1</attribute>
</xpath>
<xpath expr="//field[@name='payslip_run_id']" position="replace"/>
<xpath expr="//label[@for='date_from']" position="before">
<field name="payslip_run_id" string="工资批次"/>