Merge lp:~openerp-dev/openobject-addons/trunk-acl-event into lp:openobject-addons

Proposed by Jigar A.
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-acl-event
Merge into: lp:openobject-addons
Diff against target: 194 lines (+20/-11)
14 files modified
account/account_invoice_view.xml (+1/-1)
account/account_view.xml (+2/-1)
account/partner_view.xml (+1/-0)
crm/res_partner_view.xml (+3/-3)
crm_claim/crm_claim_view.xml (+1/-0)
event/event_view.xml (+1/-1)
membership/wizard/membership_invoice_view.xml (+1/-0)
mrp/mrp_view.xml (+1/-0)
portal_event/event_view.xml (+1/-1)
product_margin/wizard/product_margin_view.xml (+1/-0)
purchase/partner_view.xml (+1/-1)
stock/report/report_stock_view.xml (+1/-0)
stock/stock_report.xml (+1/-1)
stock/stock_view.xml (+4/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-acl-event
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+130332@code.launchpad.net

Description of the change

Fixed/Improved the Security for Event & Association Modules.
Part of the Task : `access rights testing` - http://pad.openerp.com/p/rd-project.task-4261-V6AN2SSS
Kindly Review This,
Thank You

To post a comment you must log in.

Unmerged revisions

7742. By Bharat Devnani (Open ERP)

[MERGE] merged with main addons

7741. By Bharat Devnani (Open ERP)

[IMP] removed the group which were given twice

7740. By Bharat Devnani (Open ERP)

[MERGE] merged with main addons

7739. By Bharat Devnani (Open ERP)

[MERGE] merged pna's branch lp:~openerp-dev/openobject-addons/trunk-acl-event-access-pna

7738. By Bharat Devnani (Open ERP)

[MERGE] merged hsa's branch lp:~openerp-dev/openobject-addons/trunk-acl-event-access-rights-hsa

7737. By Jigar A.

[MERGE] Sync with trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/account_invoice_view.xml'
2--- account/account_invoice_view.xml 2012-10-10 10:49:52 +0000
3+++ account/account_invoice_view.xml 2012-10-18 12:53:35 +0000
4@@ -623,7 +623,7 @@
5 </record>
6 <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="menu_finance_payables"/>
7
8- <act_window context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner"/>
9+ <act_window context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner" groups="account.group_account_invoice"/>
10
11 <act_window
12 id="act_account_journal_2_account_invoice_opened"
13
14=== modified file 'account/account_view.xml'
15--- account/account_view.xml 2012-10-17 09:41:42 +0000
16+++ account/account_view.xml 2012-10-18 12:53:35 +0000
17@@ -2025,7 +2025,8 @@
18 id="act_account_partner_account_move_all"
19 name="Receivables &amp; Payables"
20 res_model="account.move.line"
21- src_model="res.partner"/>
22+ src_model="res.partner"
23+ groups="account.group_account_invoice"/>
24
25 <act_window context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}" id="act_account_partner_account_move" name="Journal Items" res_model="account.move.line" src_model="res.partner" groups="account.group_account_user"/>
26
27
28=== modified file 'account/partner_view.xml'
29--- account/partner_view.xml 2012-09-28 17:50:12 +0000
30+++ account/partner_view.xml 2012-10-18 12:53:35 +0000
31@@ -114,6 +114,7 @@
32 context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}"
33 src_model="res.partner"
34 view_type="form"
35+ groups="analytic.group_analytic_accounting"
36 view_mode="tree,form,calendar"/>
37
38 </data>
39
40=== modified file 'crm/res_partner_view.xml'
41--- crm/res_partner_view.xml 2012-10-08 14:26:19 +0000
42+++ crm/res_partner_view.xml 2012-10-18 12:53:35 +0000
43@@ -113,12 +113,12 @@
44 <button type="action"
45 string="Meetings"
46 name="%(base_calendar.action_crm_meeting)d"
47- context="{'search_default_partner_ids': active_id, 'default_partner_ids' : [active_id]}"/>
48+ context="{'search_default_partner_ids': active_id, 'default_partner_ids' : [active_id]}" groups="base.group_sale_salesman"/>
49 <button type="action" string="Calls"
50 name="%(crm.crm_case_categ_phone_create_partner)d"
51- context="{'search_default_partner_id': active_id, 'default_duration': 1.0}" />
52+ context="{'search_default_partner_id': active_id, 'default_duration': 1.0}" groups="base.group_sale_salesman"/>
53 <button type="action" string="Opportunities" attrs="{'invisible': [('customer', '=', False)]}"
54- name="%(crm.crm_case_category_act_oppor11)d" context="{'search_default_partner_id': active_id}"/>
55+ name="%(crm.crm_case_category_act_oppor11)d" context="{'search_default_partner_id': active_id}" groups="base.group_sale_salesman"/>
56 </xpath>
57 </field>
58 </record>
59
60=== modified file 'crm_claim/crm_claim_view.xml'
61--- crm_claim/crm_claim_view.xml 2012-09-30 14:16:38 +0000
62+++ crm_claim/crm_claim_view.xml 2012-10-18 12:53:35 +0000
63@@ -258,6 +258,7 @@
64 name="Claims"
65 view_mode="tree,form"
66 res_model="crm.claim"
67+ groups="base.group_sale_salesman"
68 src_model="res.partner"/>
69
70 </data>
71
72=== modified file 'event/event_view.xml'
73--- event/event_view.xml 2012-10-15 15:28:52 +0000
74+++ event/event_view.xml 2012-10-18 12:53:35 +0000
75@@ -53,7 +53,7 @@
76 <field name="view_type">form</field>
77 </record>
78 <menuitem name="Configuration" id="base.menu_marketing_config_root" parent="event_main_menu" sequence="30"/>
79- <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_marketing_config_root" groups="base.group_no_one"/>
80+ <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_marketing_config_root" groups="event.group_event_manager"/>
81
82 <!-- Events Organisation/CONFIGURATION/EVENTS -->
83
84
85=== modified file 'membership/wizard/membership_invoice_view.xml'
86--- membership/wizard/membership_invoice_view.xml 2012-08-08 13:06:14 +0000
87+++ membership/wizard/membership_invoice_view.xml 2012-10-18 12:53:35 +0000
88@@ -35,6 +35,7 @@
89 multi="False"
90 key2="client_action_multi"
91 view_mode="form"
92+ groups="account.group_account_invoice"
93 id="action_membership_invoice_view"/>
94
95 </data>
96
97=== modified file 'mrp/mrp_view.xml'
98--- mrp/mrp_view.xml 2012-10-15 05:03:20 +0000
99+++ mrp/mrp_view.xml 2012-10-18 12:53:35 +0000
100@@ -985,6 +985,7 @@
101 id="act_product_manufacturing_open"
102 name="Manufacturing Orders"
103 view_id="mrp_production_tree_view"
104+ groups="mrp.group_mrp_user,base.group_sale_salesman,stock.group_stock_user"
105 res_model="mrp.production"
106 src_model="product.product"/>
107
108
109=== modified file 'portal_event/event_view.xml'
110--- portal_event/event_view.xml 2012-09-07 08:47:36 +0000
111+++ portal_event/event_view.xml 2012-10-18 12:53:35 +0000
112@@ -9,7 +9,7 @@
113 <field name="inherit_id" ref="event.view_event_form"/>
114 <field name="arch" type="xml">
115 <xpath expr="//page[last()]" position="after">
116- <page string="Portal Settings">
117+ <page string="Portal Settings" groups="event.group_event_manager">
118 <group>
119 <field name="visibility"/>
120 </group>
121
122=== modified file 'product_margin/wizard/product_margin_view.xml'
123--- product_margin/wizard/product_margin_view.xml 2012-08-09 06:05:16 +0000
124+++ product_margin/wizard/product_margin_view.xml 2012-10-18 12:53:35 +0000
125@@ -26,6 +26,7 @@
126 view_mode="form"
127 target="new"
128 key2="client_action_multi"
129+ groups="base.group_sale_manager"
130 id="product_margin_act_window"/>
131
132 </data>
133
134=== modified file 'purchase/partner_view.xml'
135--- purchase/partner_view.xml 2012-09-29 22:08:39 +0000
136+++ purchase/partner_view.xml 2012-10-18 12:53:35 +0000
137@@ -80,7 +80,7 @@
138 groups="purchase.group_purchase_user"/>
139 <button name="%(purchase.act_res_partner_2_supplier_invoices)d" type="action"
140 attrs="{'invisible': [('supplier', '=', False)]}"
141- string="Supplier Invoices"/>
142+ string="Supplier Invoices" groups="account.group_account_invoice"/>
143 </xpath>
144 </field>
145 </record>
146
147=== modified file 'stock/report/report_stock_view.xml'
148--- stock/report/report_stock_view.xml 2012-09-27 08:38:39 +0000
149+++ stock/report/report_stock_view.xml 2012-10-18 12:53:35 +0000
150@@ -6,6 +6,7 @@
151 context="{'product_id': active_id}"
152 id="act_stock_product_location_open"
153 name="Stock by Location"
154+ groups="stock.group_stock_user,base.group_sale_salesman"
155 res_model="stock.location"
156 src_model="product.product"/>
157
158
159=== modified file 'stock/stock_report.xml'
160--- stock/stock_report.xml 2012-05-16 16:01:15 +0000
161+++ stock/stock_report.xml 2012-10-18 12:53:35 +0000
162@@ -1,7 +1,7 @@
163 <?xml version="1.0" encoding="utf-8"?>
164 <openerp>
165 <data>
166- <report auto="False" id="report_product_history" model="product.product" name="stock.product.history" string="Stock Level Forecast"/>
167+ <report auto="False" id="report_product_history" model="product.product" name="stock.product.history" string="Stock Level Forecast" groups="stock.group_stock_user"/>
168 <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Picking Slip" rml="stock/report/picking.rml"/>
169 <report id="report_picking_list_in" model="stock.picking.in" name="stock.picking.list" string="Receipt Slip" rml="stock/report/picking.rml"/>
170 <report id="report_picking_list_out" model="stock.picking.out" name="stock.picking.list" string="Delivery Slip" rml="stock/report/picking.rml"/>
171
172=== modified file 'stock/stock_view.xml'
173--- stock/stock_view.xml 2012-10-13 10:43:24 +0000
174+++ stock/stock_view.xml 2012-10-18 12:53:35 +0000
175@@ -1564,7 +1564,8 @@
176 id="act_product_stock_move_open"
177 name="Inventory Move"
178 res_model="stock.move"
179- src_model="product.product"/>
180+ src_model="product.product"
181+ groups="base.group_sale_manager,stock.group_stock_user"/>
182
183 <act_window
184 context="{'search_default_future': 1,'search_default_product_id': [active_id], 'default_product_id': active_id}"
185@@ -1572,7 +1573,8 @@
186 id="act_product_stock_move_futur_open"
187 name="Future Stock Moves"
188 res_model="stock.move"
189- src_model="product.product"/>
190+ src_model="product.product"
191+ groups="base.group_sale_manager,stock.group_stock_user"/>
192
193 <record id="ir_act_product_location_open" model="ir.values">
194 <field name="key2">tree_but_open</field>

Subscribers

People subscribed via source and target branches

to all changes: