Merge lp:~openerp-dev/openobject-server/saas-4-opw-607201-acl into lp:~openerp/openobject-server/saas-4

Proposed by Anaël Closson (openerp)
Status: Merged
Merged at revision: 5204
Proposed branch: lp:~openerp-dev/openobject-server/saas-4-opw-607201-acl
Merge into: lp:~openerp/openobject-server/saas-4
Diff against target: 11 lines (+1/-0)
1 file modified
openerp/addons/base/ir/ir_ui_view_view.xml (+1/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/saas-4-opw-607201-acl
Reviewer Review Type Date Requested Status
Martin Trigaux (OpenERP) (community) Approve
Review via email: mp+217418@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Trigaux (OpenERP) (mat-openerp) wrote :

LGTM, merged in saas-4

revno: 5204 [merge]
revision-id: <email address hidden>

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/addons/base/ir/ir_ui_view_view.xml'
2--- openerp/addons/base/ir/ir_ui_view_view.xml 2014-01-29 05:03:41 +0000
3+++ openerp/addons/base/ir/ir_ui_view_view.xml 2014-04-28 11:31:51 +0000
4@@ -59,6 +59,7 @@
5 <field name="model"/>
6 <field name="inherit_id"/>
7 <field name="type"/>
8+ <field name="arch"/>
9 <group expand="0" string="Group By...">
10 <filter string="Object" domain="[]" context="{'group_by':'model'}"/>
11 <filter string="Type" domain="[]" context="{'group_by':'type'}"/>

Subscribers

People subscribed via source and target branches