Odoo Server (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-server/6.0-opw-16203-rha into lp:openobject-server/6.0

  1. 6.0-opw-16203-rha
  2. Merge into 6.0
Proposed by Rifakat Husen (OpenERP)
Status: Merged
Merged at revision: 3465
Proposed branch: lp:~openerp-dev/openobject-server/6.0-opw-16203-rha
Merge into: lp:openobject-server/6.0
Diff against target: 25 lines (+6/-3)
1 file modified
bin/addons/base/res/res_security.xml (+6/-3)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/6.0-opw-16203-rha
Reviewer Review Type Date Requested Status
Priyesh (OpenERP) (community) Approve
Olivier Dony (Odoo) Pending
Review via email: mp+68082@code.launchpad.net

Description of the change

Hello,

I have added data tag with noupdate='1' excluding the groups defination, to be able to update the record rules.

Thanks,
Rifakat

To post a comment you must log in.
Revision history for this message
Priyesh (OpenERP) (pso-openerp) wrote :

Hello Rifakat,

Thanks for the fix. Though, I need approval of Olivier.

Olivier, Can you please share your views ?

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/base/res/res_security.xml'
2--- bin/addons/base/res/res_security.xml 2011-03-02 11:08:16 +0000
3+++ bin/addons/base/res/res_security.xml 2011-07-15 12:13:28 +0000
4@@ -12,7 +12,11 @@
5 <record model="ir.ui.menu" id="menu_base_config">
6 <field eval="[(6,0,[ref('group_system'), ref('group_partner_manager')])]" name="groups_id"/>
7 </record>
8-
9+
10+</data>
11+
12+
13+<data noupdate="1">
14
15 <!-- Record Rule For Company -->
16
17@@ -31,7 +35,6 @@
18 <field eval="True" name="global"/>
19 <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
20 </record>
21-
22-
23+
24 </data>
25 </openerp>