diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-01-19 17:15:56 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-01-19 17:15:56 +0100 |
| commit | 18e22be138f4d273ce8f63c0ff2c8a437cf6ce5d (patch) | |
| tree | 63bd658de7b6fa0e91d521ca19322dd68bdc1492 /addons/base_setup | |
| parent | f6e5bf847b1a7107c09b009a757823b0f9514fa4 (diff) | |
| parent | 0aab81cd3ac6881b2b64ccedb901b55badd421d4 (diff) | |
[MERGE] forward port of branch 8.0 up to 0aab81c
Diffstat (limited to 'addons/base_setup')
| -rw-r--r-- | addons/base_setup/__openerp__.py | 1 | ||||
| -rw-r--r-- | addons/base_setup/res_config.py | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py index c8756384054..1276a4eff9c 100644 --- a/addons/base_setup/__openerp__.py +++ b/addons/base_setup/__openerp__.py @@ -44,5 +44,4 @@ Shows you a list of applications features to install from. 'demo': [], 'installable': True, 'auto_install': False, - 'images': ['images/base_setup1.jpeg','images/base_setup2.jpeg','images/base_setup3.jpeg','images/base_setup4.jpeg',], } diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py index fd075e4330c..7742f19d77e 100644 --- a/addons/base_setup/res_config.py +++ b/addons/base_setup/res_config.py @@ -32,7 +32,7 @@ class base_config_settings(osv.osv_memory): help='Work in multi-company environments, with appropriate security access between companies.\n' '-This installs the module multi_company.'), 'module_share': fields.boolean('Allow documents sharing', - help="""Share or embbed any screen of openerp."""), + help="""Share or embbed any screen of Odoo."""), 'module_portal': fields.boolean('Activate the customer portal', help="""Give your customers access to their documents."""), 'module_auth_oauth': fields.boolean('Use external authentication providers, sign in with google, facebook, ...'), |