!9451 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang
Merge pull request !9451 from 李鹏宇/dev_wang
This commit is contained in:
@@ -56,7 +56,6 @@
|
||||
<field name="department_id" invisible="1"/>
|
||||
<field name="entrusted_agent_id" groups="yuthon_salary.group_jtbb_user,yuthon_salary.group_wg_user"
|
||||
domain="[('employee_id.department_id', '=', department_id)]"/>
|
||||
<field name="is_entrusted" invisible="not entrusted_agent_id" groups="yuthon_salary.group_jtbb_user,yuthon_salary.group_wg_user"/>
|
||||
<field name="days" invisible="1"/>
|
||||
<field name="employee_id" invisible="1" force_save="1"/>
|
||||
<field name="text"/>
|
||||
@@ -67,6 +66,9 @@
|
||||
<field name="holiday_allowance" readonly="1"/>
|
||||
</group>
|
||||
</group>
|
||||
<group col="1" groups="yuthon_salary.group_jtbb_user,yuthon_salary.group_wg_user">
|
||||
<field name="is_entrusted" invisible="not entrusted_agent_id"/>
|
||||
</group>
|
||||
<group col="1">
|
||||
<field name="is_day"/>
|
||||
</group>
|
||||
|
||||
Reference in New Issue
Block a user