diff options
| author | Xavier Morel <xmo@openerp.com> | 2014-05-14 15:13:04 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2014-05-14 15:13:04 +0200 |
| commit | f4d78ae738e474abd4e77dc8fc6cdf8a668a5d72 (patch) | |
| tree | a02d0dedc047ff296517530b50a33556e5d4f6c7 /openerp/addons/base/security/base_security.xml | |
| parent | 9d9cfd585f56bf64126e7316ea60ea5131a02059 (diff) | |
| parent | 4f5cc00420c6af5430ac921e89f217dcedaa1b8f (diff) | |
Merge branch 'server-trunk'
Conflicts:
addons/mass_mailing/controllers/main.py
Diffstat (limited to 'openerp/addons/base/security/base_security.xml')
| -rw-r--r-- | openerp/addons/base/security/base_security.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openerp/addons/base/security/base_security.xml b/openerp/addons/base/security/base_security.xml index c0f4242198c..755e20c3832 100644 --- a/openerp/addons/base/security/base_security.xml +++ b/openerp/addons/base/security/base_security.xml @@ -43,7 +43,7 @@ <!-- Set accesses to menu --> <record model="ir.ui.menu" id="base.menu_administration"> - <field name="name">Administration</field> + <field name="name">Settings</field> <field name="groups_id" eval="[(6,0, [ref('group_system'), ref('group_erp_manager')])]"/> </record> |