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

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
=== modified file 'bin/addons/sync_server/security/ir.model.access.csv'
--- bin/addons/sync_server/security/ir.model.access.csv 2017-05-03 06:55:06 +0000
+++ bin/addons/sync_server/security/ir.model.access.csv 2017-07-19 12:02:37 +0000
@@ -46,3 +46,8 @@
46"sync_read_ir_exports_line_id","sync_read_ir_exports_line","ir.exports.line",1,0,0,0,"sync_common.sync_read_group"46"sync_read_ir_exports_line_id","sync_read_ir_exports_line","ir.exports.line",1,0,0,0,"sync_common.sync_read_group"
47"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"47"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"
48"sync_read_ir_property_id","sync_read_ir_property","ir.property",1,0,0,0,"sync_common.sync_read_group"48"sync_read_ir_property_id","sync_read_ir_property","ir.property",1,0,0,0,"sync_common.sync_read_group"
49"access_res_users_user_sync_read","res_users_user sync_read","res.users",1,1,1,0,"sync_common.sync_read_group"
50"access_res_groups_user_sync_read","res_groups_user sync_read","res.groups",1,1,1,0,"sync_common.sync_read_group"
51"access_unifield_setup_configuration_all","model_unifield_setup_configuration","unifield.setup.configuration",1,1,1,1,
52"access_res_partner_address_sync_read","model_res_partner_address","res.partner.address",1,1,1,0,sync_common.sync_read_group
53"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
4954
=== modified file 'bin/addons/sync_server/sync_server_menu.xml'
--- bin/addons/sync_server/sync_server_menu.xml 2016-12-02 13:29:29 +0000
+++ bin/addons/sync_server/sync_server_menu.xml 2017-07-19 12:02:37 +0000
@@ -34,7 +34,7 @@
34 groups="base.group_extended"34 groups="base.group_extended"
35 parent="base.menu_translation"/>35 parent="base.menu_translation"/>
36 <menuitem id="base.menu_users"36 <menuitem id="base.menu_users"
37 groups="base.group_erp_manager"37 groups="base.group_erp_manager,sync_common.sync_read_group"
38 parent="base.menu_administration"/>38 parent="base.menu_administration"/>
39 <menuitem id="base.menu_security"39 <menuitem id="base.menu_security"
40 parent="base.menu_administration"40 parent="base.menu_administration"
@@ -65,5 +65,9 @@
65 groups="base.group_erp_manager"/>65 groups="base.group_erp_manager"/>
66 <menuitem id="sync_client.main_menu"66 <menuitem id="sync_client.main_menu"
67 groups="base.group_erp_manager"/>67 groups="base.group_erp_manager"/>
68 <menuitem action="base.action_res_users" id="base.menu_action_res_users" parent="base.menu_users"
69 groups="sync_common.sync_read_group"/>
70 <menuitem action="base.action_res_groups" id="base.menu_action_res_groups" parent="base.menu_users"
71 groups="base.group_extended,sync_common.sync_read_group"/>
68 </data>72 </data>
69</openerp>73</openerp>
7074
=== modified file 'bin/addons/sync_server/sync_server_view.xml'
--- bin/addons/sync_server/sync_server_view.xml 2017-02-24 14:15:56 +0000
+++ bin/addons/sync_server/sync_server_view.xml 2017-07-19 12:02:37 +0000
@@ -182,7 +182,7 @@
182 action="entity_action"/>182 action="entity_action"/>
183183
184 <menuitem id="group_menu" name="Groups" parent="conf_menu" sequence="20"184 <menuitem id="group_menu" name="Groups" parent="conf_menu" sequence="20"
185 groups="base.group_erp_manager"185 groups="base.group_erp_manager,sync_common.sync_read_group"
186 action="group_action"/>186 action="group_action"/>
187187
188 <menuitem id="group_type_menu" name="Type of Group" parent="conf_menu" sequence="30"188 <menuitem id="group_type_menu" name="Type of Group" parent="conf_menu" sequence="30"

Subscribers

People subscribed via source and target branches