[Merge] Merge with main branch

bzr revid: mdi@tinyerp.com-20120412063652-e4vgtl5cbr117c4g

2 files changed, 63 insertions, 16 deletions

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index c10dee7b14b..a3effd98148 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -201,4 +201,30 @@ class specify_partner_terminology(osv.osv_memory):
                 self.make_translations(cr, uid, ids, act_ref, 'model', act_id.help, _case_insensitive_replace(act_id.help,'Customer',o.partner), res_id=act_id.id, context=context)
         return {}
 
+
+
+# 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, a task, a project, an analytical
+                account, or any other object and attach the selected mail as a .eml file in
+                the attachment of a selected record. You can create documents for CRM Lead,
+                HR Applicant and Project Issue 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, a task,
+                a project, an analytical account, or any other 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:
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 4155c7e9957..453d4b167c0 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -1,21 +1,6 @@
 <openerp>
   <data>
 
-     <!-- Import or create customers configartion view  -->
-     <record id="action_import_create_installer" model="ir.actions.act_window">
-         <field name="name">Create or Import Customers</field>
-         <field name="type">ir.actions.act_window</field>
-         <field name="res_model">res.partner</field>
-         <field name="view_type">form</field>
-         <field name="view_mode">tree,form</field>
-         <field name="view_id" ref="base.view_partner_tree"/>
-         <field name="help">Create or Import Customers  and their contacts manually from this form or you can import your existing partners by CSV spreadsheet from "Import Data" wizard</field>
-     </record>
-     <record id="config_wizard_action_import_create_installer" model="ir.actions.todo">
-         <field name="action_id" ref="action_import_create_installer"/>
-         <field name="category_id" ref="base.category_sales_management_config"/>
-    </record>
-
      <!-- Define default users preferences-->
      <record id="view_user_preferences_config_form" model="ir.ui.view">
           <field name="name">Set default users preferences</field>
@@ -117,7 +102,7 @@
           <field name="view_mode">form</field>
           <field name="target">new</field>
       </record>
-   <!-- 
+   <!--
       <record id="config_action_partner_terminology_config_form" model="ir.actions.todo">
           <field name="action_id" ref="action_partner_terminology_config_form"/>
           <field name="category_id" ref="base.category_administration_config"/>
@@ -142,5 +127,41 @@
         <field name="sequence">1</field>
     </record>
 
+    <record id="base.view_sale_config_settings" model="ir.ui.view">
+        <field name="name">sale settings</field>
+        <field name="model">sale.config.settings</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Configure Sales">
+                <group name="config_sale" colspan="4"/>
+
+                <!-- this part is necessary to allow the plugins to extend the view -->
+                <field name="module_crm" invisible="1"/>
+                <group name="config_fetchmail" colspan="4" attrs="{'invisible': [('module_crm','=',False)]}">
+                    <separator string="Emails"/>
+                </group>
+                <field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/>
+                <newline/>
+                <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
+
+                <group name="config_crm" colspan="4"/>
+
+                <newline/>
+                <label colspan="2"/>
+                <button string="Cancel" icon="gtk-cancel" special="cancel"/>
+                <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
+            </form>
+        </field>
+    </record>
+    
+    <record id="base.action_sale_config" model="ir.actions.act_window">
+        <field name="name">Configure Sales</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sale.config.settings</field>
+        <field name="view_id" ref="base.view_sale_config_settings"/>
+        <field name="view_mode">form</field>
+        <field name="target">inline</field>
+    </record>
+
   </data>
 </openerp>