Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang
This commit is contained in:
@@ -401,12 +401,16 @@
|
||||
<field name="used_this_year"/>
|
||||
<field name="last_holiday"/>
|
||||
<field name="number_card"/>
|
||||
<field name="dynamic_previous_year"/>
|
||||
<field name="dynamic_remainder_year"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="last_workday"/>
|
||||
<field name="year_holiday"/>
|
||||
<field name="year_workday"/>
|
||||
<field name="used_this_year1"/>
|
||||
<field name="dynamic_previous_year1"/>
|
||||
<field name="this_year1"/>
|
||||
</group>
|
||||
</group>
|
||||
</page>
|
||||
|
||||
@@ -43,7 +43,6 @@ access_yuthon_individual_tax,access_yuthon_individual_tax,model_yuthon_individua
|
||||
access_party_send_wizard,access_party_send_wizard,model_party_send_wizard,base.group_user,1,1,1,1
|
||||
|
||||
access_yuthon_meal_expenses,access_yuthon_meal_expenses,model_yuthon_meal_expenses,base.group_user,1,0,0,0
|
||||
access_yuthon_meal_expenses_admin,access_yuthon_meal_expenses_admin,model_yuthon_meal_expenses,base.group_system,1,1,1,1
|
||||
access_party_meal_wizard,access_party_meal_wizard,model_party_meal_wizard,base.group_user,1,1,1,1
|
||||
access_salary_meal_wizard,access_salary_meal_wizard,model_salary_meal_wizard,base.group_user,1,1,1,1
|
||||
access_yuthon_salary_active,access_yuthon_salary_active,model_yuthon_salary_active,base.group_user,1,1,1,1
|
||||
|
||||
|
Reference in New Issue
Block a user