diff options
| author | Antony Lesuisse <al@openerp.com> | 2012-08-18 18:49:32 +0200 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2012-08-18 18:49:32 +0200 |
| commit | 297cff0449ddb7b7bdcbbe2bd7c8b80c5cb00a35 (patch) | |
| tree | bc87a329ecff353cf2aad001e984a9e20a924911 /addons/base_setup | |
| parent | 6cce0bd9fc7d54602c551213429e151b53963397 (diff) | |
| parent | 4f76c4e8d9fecca6ffc091f13c40ac3eadcc742d (diff) | |
[MERGE] auth_config
bzr revid: al@openerp.com-20120818164932-tt7mpm1p5k3i5unu
Diffstat (limited to 'addons/base_setup')
| -rw-r--r-- | addons/base_setup/res_config.py | 9 | ||||
| -rw-r--r-- | addons/base_setup/res_config_view.xml | 28 |
2 files changed, 27 insertions, 10 deletions
diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py index 059a674e5f1..4826a50400d 100644 --- a/addons/base_setup/res_config.py +++ b/addons/base_setup/res_config.py @@ -28,10 +28,13 @@ class base_config_settings(osv.osv_memory): 'module_multi_company': fields.boolean('manage multiple companies', help="""Work in multi-company environments, with appropriate security access between companies. This installs the module multi_company."""), - 'module_portal': fields.boolean('activate customer portal', - help="""The portal will give access to a series of documents for your customers; his quotations, his invoices, his projects, etc."""), 'module_share': fields.boolean('allow documents sharing', - help="""As an example, you will be able to share a project or some tasks to your customers, or quotes/sales to several persons at your customer company, or your agenda availabilities to your contacts."""), + help="""Share or embbed any screen of openerp."""), + 'module_portal': fields.boolean('activate the customer/supplier portal', + help="""Give access your customers and suppliers to their documents."""), + 'module_auth_anonymous': fields.boolean('activate the public portal', + help="""Enable the public part of openerp, openerp becomes a public website."""), + 'module_auth_oauth': fields.boolean('use external authentication providers, sign in with google, facebook, ...'), } def open_company(self, cr, uid, ids, context=None): diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml index fe0fc7d1254..512c0a3f52e 100644 --- a/addons/base_setup/res_config_view.xml +++ b/addons/base_setup/res_config_view.xml @@ -28,20 +28,34 @@ </div> </group> <group> - <label for="id" string="Share Data"/> - <div> + <label for="id" string="Email"/> + <div name="email"> <div> - <field name="module_share" class="oe_inline"/> - <label for="module_share"/> + <button type="action" + name="%(base.action_ir_mail_server_list)d" + string="Configure outgoing email servers" class="oe_link"/> </div> + </div> + </group> + <group> + <label for="id" string="Portal access"/> + <div> <div> <field name="module_portal" class="oe_inline"/> <label for="module_portal"/> </div> <div> - <button type="action" - name="%(base.action_ir_mail_server_list)d" - string="Configure outgoing email servers" class="oe_link"/> + <field name="module_auth_anonymous" class="oe_inline"/> + <label for="module_auth_anonymous"/> + </div> + </div> + </group> + <group> + <label for="id" string="Authentication"/> + <div> + <div> + <field name="module_auth_oauth" class="oe_inline"/> + <label for="module_auth_oauth"/> </div> </div> </group> |