diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-03-15 12:43:38 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-03-15 12:43:38 +0100 |
| commit | 4484a3197ca558341ce595df41ffdc072a8d05d2 (patch) | |
| tree | 160895b3cd052ef5a0661ed2ee02a53494dab207 /addons/lunch | |
| parent | 4387187b8bdac6223979e9a652b6ef6a19096804 (diff) | |
| parent | d0f5b28bd0da703e3d5a23cb68db91a6a87482dc (diff) | |
[MERGE] Sync with trunk, resolved conflicts due to forward port of 7.0
bzr revid: tde@openerp.com-20130315114338-54scb00rkp7zwr30
Diffstat (limited to 'addons/lunch')
| -rw-r--r-- | addons/lunch/lunch_demo.xml | 3 | ||||
| -rw-r--r-- | addons/lunch/lunch_view.xml | 2 | ||||
| -rw-r--r-- | addons/lunch/security/lunch_security.xml | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/addons/lunch/lunch_demo.xml b/addons/lunch/lunch_demo.xml index 7488208fd42..7e5e2f3ac8f 100644 --- a/addons/lunch/lunch_demo.xml +++ b/addons/lunch/lunch_demo.xml @@ -2,9 +2,6 @@ <openerp> <data noupdate="1"> - <record id="base.user_root" model="res.users"> - <field name="groups_id" eval="[(4,ref('lunch.group_lunch_manager'))]"/> - </record> <record id="base.user_demo" model="res.users"> <field name="groups_id" eval="[(4,ref('lunch.group_lunch_user'))]"/> </record> diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml index 4a70fa896e4..2f3af2f461d 100644 --- a/addons/lunch/lunch_view.xml +++ b/addons/lunch/lunch_view.xml @@ -283,7 +283,7 @@ <field name="name">Order lines Tree</field> <field name="model">lunch.order.line</field> <field name="arch" type="xml"> - <tree string="Order lines Tree"> + <tree string="Order lines Tree" create="false" edit="false"> <field name='date'/> <field name='user_id'/> <field name='supplier' invisible='1'/> diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml index 654f844c876..e01fab71ea2 100644 --- a/addons/lunch/security/lunch_security.xml +++ b/addons/lunch/security/lunch_security.xml @@ -14,6 +14,7 @@ <field name="name">Manager</field> <field name="implied_ids" eval="[(4, ref('group_lunch_user'))]"/> <field name="category_id" ref="module_lunch_category"/> + <field name="users" eval="[(4, ref('base.user_root'))]"/> </record> </data> </openerp> |