[MERGE]merged with trunk-survey-layout-tta

bzr revid: vba@tinyerp.com-20120709130113-3lchipgil9oqpglg

1 files changed, 39 insertions, 7 deletions

diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 92914f8f7a3..6a73eb786ea 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -28,13 +28,45 @@ class base_config_settings(osv.osv_memory):
         'module_multi_company': fields.boolean('Multi Company',
             help="""Work in multi-company environments, with appropriate security access between companies.
                 This installs the module multi_company."""),
-        'module_portal': fields.boolean('Portal',
-            help="""Define a portal for your customers or suppliers.  The portal is a group of
-                external users that has specific access rights and rules.
-                This installs the module portal."""),
-        'module_share': fields.boolean('Share',
-            help="""Share OpenERP documents (records) with external users.
-                This installs the module share."""),
+        '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 Sharing Resources to External Users',
+            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."""),
+    }
+
+    def open_company(self, cr, uid, ids, context=None):
+        user = self.pool.get('res.users').browse(cr, uid, uid, context)
+        return {
+            'type': 'ir.actions.act_window',
+            'name': 'Your Company',
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'res.company',
+            'res_id': user.company_id.id,
+            'target': 'current',
+        }
+
+# Preferences wizard for Sales & CRM.
+# It is defined here because it is inherited independently in modules sale, crm,
+# plugin_outlook and plugin_thunderbird.
+class sale_config_settings(osv.osv_memory):
+    _name = 'sale.config.settings'
+    _inherit = 'res.config.settings'
+    _columns = {
+        'module_crm': fields.boolean('CRM'),
+        'module_plugin_thunderbird': fields.boolean('Thunderbird Plugin',
+            help="""The plugin allows you archive email and its attachments to the selected
+                OpenERP objects. You can select a partner, or a lead and
+                attach the selected mail as a .eml file in
+                the attachment of a selected record. You can create documents for CRM Lead,
+                Partner from the selected emails.
+                This installs the module plugin_thunderbird."""),
+        'module_plugin_outlook': fields.boolean('Outlook Plugin',
+            help="""The Outlook plugin allows you to select an object that you would like to add
+                to your email and its attachments from MS Outlook. You can select a partner,
+                or a lead object and archive a selected
+                email into an OpenERP mail message with attachments.
+                This installs the module plugin_outlook."""),
     }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: