jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决合并develop冲突

Browse Source
This commit is contained in:
chenye
2025-07-07 10:03:09 +08:00
parent 86bacee926 20df1c0365
commit bd6f35a16f
25 changed files with 714 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sf_demand_plan/security/ir.model.access.csv
View File

@@ -5,6 +5,7 @@ access_sf_production_demand_plan_for_dispatch,sf.production.demand.plan for disp
access_sf_demand_plan_print_wizard,sf.demand.plan.print.wizard,model_sf_demand_plan_print_wizard,base.group_user,1,0,0,0
access_sf_demand_plan_print_wizard_for_dispatch,sf.demand.plan.print.wizard for dispatch,model_sf_demand_plan_print_wizard,sf_base.group_plan_dispatch,1,1,0,0
<<<<<<< HEAD
access_sf_demand_main_plan,sf.demand.main.plan,model_sf_demand_main_plan,base.group_user,1,0,0,0
access_sf_demand_main_plan_for_dispatch,sf.demand.main.plan for dispatch,model_sf_demand_main_plan,sf_base.group_plan_dispatch,1,1,0,0
@@ -12,4 +13,8 @@ access_stock_route_group,stock.route.group,model_stock_route_group,base.group_us
access_stock_route_group_dispatch,stock.route.group.dispatch,model_stock_route_group,sf_base.group_plan_dispatch,1,1,0,0
access_sf_release_plan_wizard,sf.release.plan.wizard,model_sf_release_plan_wizard,base.group_user,1,0,0,0
access_sf_release_plan_wizard_for_dispatch,sf.release.plan.wizard for dispatch,model_sf_release_plan_wizard,sf_base.group_plan_dispatch,1,1,1,1
access_sf_release_plan_wizard_for_dispatch,sf.release.plan.wizard for dispatch,model_sf_release_plan_wizard,sf_base.group_plan_dispatch,1,1,1,1
=======
access_stock_route_group,stock.route.group,model_stock_route_group,base.group_user,1,0,0,0
access_stock_route_group_dispatch,stock.route.group.dispatch,model_stock_route_group,sf_base.group_plan_dispatch,1,1,0,0
>>>>>>> develop
1 id id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
5 access_sf_demand_plan_print_wizard_for_dispatch access_sf_demand_plan_print_wizard_for_dispatch,sf.demand.plan.print.wizard for dispatch,model_sf_demand_plan_print_wizard,sf_base.group_plan_dispatch,1,1,0,0 sf.demand.plan.print.wizard for dispatch model_sf_demand_plan_print_wizard sf_base.group_plan_dispatch 1 1 0 0
6 access_sf_demand_main_plan <<<<<<< HEAD sf.demand.main.plan model_sf_demand_main_plan base.group_user 1 0 0 0
7 access_sf_demand_main_plan_for_dispatch access_sf_demand_main_plan,sf.demand.main.plan,model_sf_demand_main_plan,base.group_user,1,0,0,0 sf.demand.main.plan for dispatch model_sf_demand_main_plan sf_base.group_plan_dispatch 1 1 0 0
8 access_sf_demand_main_plan_for_dispatch,sf.demand.main.plan for dispatch,model_sf_demand_main_plan,sf_base.group_plan_dispatch,1,1,0,0
9 access_stock_route_group access_stock_route_group,stock.route.group,model_stock_route_group,base.group_user,1,0,0,0 stock.route.group model_stock_route_group base.group_user 1 0 0 0
10 access_stock_route_group_dispatch access_stock_route_group_dispatch,stock.route.group.dispatch,model_stock_route_group,sf_base.group_plan_dispatch,1,1,0,0 stock.route.group.dispatch model_stock_route_group sf_base.group_plan_dispatch 1 1 0 0
11 access_sf_release_plan_wizard access_sf_release_plan_wizard,sf.release.plan.wizard,model_sf_release_plan_wizard,base.group_user,1,0,0,0 sf.release.plan.wizard model_sf_release_plan_wizard base.group_user 1 0 0 0
13 =======
14 access_stock_route_group,stock.route.group,model_stock_route_group,base.group_user,1,0,0,0
15 access_stock_route_group_dispatch,stock.route.group.dispatch,model_stock_route_group,sf_base.group_plan_dispatch,1,1,0,0
16 >>>>>>> develop
17
18
19
20