Unifield Server

Merge lp:~fabien-morin/unifield-server/fm-us-3131 into lp:unifield-server

  1. fm-us-3131
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4449
Proposed branch: lp:~fabien-morin/unifield-server/fm-us-3131
Merge into: lp:unifield-server
Diff against target: 48 lines (+11/-2)
3 files modified
bin/addons/sync_server/security/ir.model.access.csv (+5/-0)
bin/addons/sync_server/sync_server_menu.xml (+5/-1)
bin/addons/sync_server/sync_server_view.xml (+1/-1)
To merge this branch: bzr merge lp:~fabien-morin/unifield-server/fm-us-3131
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+327703@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/sync_server/security/ir.model.access.csv'
2--- bin/addons/sync_server/security/ir.model.access.csv 2017-05-03 06:55:06 +0000
3+++ bin/addons/sync_server/security/ir.model.access.csv 2017-07-19 12:02:37 +0000
4@@ -46,3 +46,8 @@
5 "sync_read_ir_exports_line_id","sync_read_ir_exports_line","ir.exports.line",1,0,0,0,"sync_common.sync_read_group"
6 "sync_read_ir_ui_view_sc_id","sync_read_ir_ui_view_sc","ir.ui.view_sc",1,1,1,1,"sync_common.sync_read_group"
7 "sync_read_ir_property_id","sync_read_ir_property","ir.property",1,0,0,0,"sync_common.sync_read_group"
8+"access_res_users_user_sync_read","res_users_user sync_read","res.users",1,1,1,0,"sync_common.sync_read_group"
9+"access_res_groups_user_sync_read","res_groups_user sync_read","res.groups",1,1,1,0,"sync_common.sync_read_group"
10+"access_unifield_setup_configuration_all","model_unifield_setup_configuration","unifield.setup.configuration",1,1,1,1,
11+"access_res_partner_address_sync_read","model_res_partner_address","res.partner.address",1,1,1,0,sync_common.sync_read_group
12+"access_sync_server_entity_group_sync_read","model_sync_server_entity_group","sync.server.entity_group",1,1,1,0,sync_common.sync_read_group
13
14=== modified file 'bin/addons/sync_server/sync_server_menu.xml'
15--- bin/addons/sync_server/sync_server_menu.xml 2016-12-02 13:29:29 +0000
16+++ bin/addons/sync_server/sync_server_menu.xml 2017-07-19 12:02:37 +0000
17@@ -34,7 +34,7 @@
18 groups="base.group_extended"
19 parent="base.menu_translation"/>
20 <menuitem id="base.menu_users"
21- groups="base.group_erp_manager"
22+ groups="base.group_erp_manager,sync_common.sync_read_group"
23 parent="base.menu_administration"/>
24 <menuitem id="base.menu_security"
25 parent="base.menu_administration"
26@@ -65,5 +65,9 @@
27 groups="base.group_erp_manager"/>
28 <menuitem id="sync_client.main_menu"
29 groups="base.group_erp_manager"/>
30+ <menuitem action="base.action_res_users" id="base.menu_action_res_users" parent="base.menu_users"
31+ groups="sync_common.sync_read_group"/>
32+ <menuitem action="base.action_res_groups" id="base.menu_action_res_groups" parent="base.menu_users"
33+ groups="base.group_extended,sync_common.sync_read_group"/>
34 </data>
35 </openerp>
36
37=== modified file 'bin/addons/sync_server/sync_server_view.xml'
38--- bin/addons/sync_server/sync_server_view.xml 2017-02-24 14:15:56 +0000
39+++ bin/addons/sync_server/sync_server_view.xml 2017-07-19 12:02:37 +0000
40@@ -182,7 +182,7 @@
41 action="entity_action"/>
42
43 <menuitem id="group_menu" name="Groups" parent="conf_menu" sequence="20"
44- groups="base.group_erp_manager"
45+ groups="base.group_erp_manager,sync_common.sync_read_group"
46 action="group_action"/>
47
48 <menuitem id="group_type_menu" name="Type of Group" parent="conf_menu" sequence="30"

Subscribers

People subscribed via source and target branches