From 99d3f87610bc75a4b8ace6c67612daa2f31a5ea0 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Mon, 2 May 2011 15:34:53 +0530
Subject: [PATCH] [IMP]CRM :Remove CRM Application Configuration  Wiz and
 inherit it to INstall Appl wiz

bzr revid: aag@tinyerp.co.in-20110502100453-t6y6s48a4ciqwo7a
---
 addons/crm/crm_installer.py       | 11 +++--
 addons/crm/crm_installer_view.xml | 73 +++++++------------------------
 2 files changed, 22 insertions(+), 62 deletions(-)

diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py
index 32551d438c4..ee7e9b1b3c4 100644
--- a/addons/crm/crm_installer.py
+++ b/addons/crm/crm_installer.py
@@ -23,19 +23,18 @@ from lxml import etree
 from osv import fields, osv
 
 class crm_installer(osv.osv_memory):
-    _name = 'crm.installer'
-    _inherit = 'res.config.installer'
+    _inherit = 'base.setup.installer'
 
     _columns = {
         'name': fields.char('Name', size=64),
         'crm_helpdesk': fields.boolean('Helpdesk', help="Manages a Helpdesk service."),
         'crm_fundraising': fields.boolean('Fundraising', help="This may help associations in their fundraising process and tracking."),
         'crm_claim': fields.boolean('Claims', help="Manages the suppliers and customers claims, including your corrective or preventive actions."),
-        'crm_caldav': fields.boolean('Calendar Synchronizing', help="Helps you to synchronize the meetings with other calendar clients and mobiles."),
+        'crm_caldav': fields.boolean('Synchronization:Calendar Synchronizing', help="Helps you to synchronize the meetings with other calendar clients and mobiles."),
         'sale_crm': fields.boolean('Opportunity to Quotation', help="This module relates sale from opportunity cases in the CRM."),
-        'fetchmail': fields.boolean('Fetch Emails', help="Allows you to receive E-Mails from POP/IMAP server."),
-        'thunderbird': fields.boolean('Thunderbird', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
-        'outlook': fields.boolean('MS-Outlook', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
+        'fetchmail': fields.boolean('Synchronization:Fetch Emails', help="Allows you to receive E-Mails from POP/IMAP server."),
+        'thunderbird': fields.boolean('Plug-In:Thunderbird', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
+        'outlook': fields.boolean('Plug-In:MS-Outlook', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
         'wiki_sale_faq': fields.boolean('Sale FAQ', help="Helps you manage wiki pages for Frequently Asked Questions on Sales Application."),
     }
 
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
index 7b7717a1fe1..b9378a77202 100644
--- a/addons/crm/crm_installer_view.xml
+++ b/addons/crm/crm_installer_view.xml
@@ -2,69 +2,30 @@
   <data>
     <record id="view_crm_installer" model="ir.ui.view">
       <field name="name">crm.installer.view</field>
-      <field name="model">crm.installer</field>
+      <field name="model">base.setup.installer</field>
       <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_installer"/>
+      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
       <field name="arch" type="xml">
         <data>
-          <form position="attributes">
-            <attribute name="string">CRM Application Configuration</attribute>
-          </form>
-
-          <separator string="title" position="attributes">
-            <attribute name="string">Configure Your CRM Application</attribute>
-          </separator>
-          <xpath expr="//label[@string='description']"
-                 position="attributes">
-            <attribute name="string">Enhance your core CRM Application with additional functionalities.</attribute>
-          </xpath>
-          <xpath expr='//separator[@string="vsep"]' position='attributes'>
-              <attribute name='rowspan'>13</attribute>
-              <attribute name='string'></attribute>
-          </xpath>
-          <xpath expr="//button[@string='Install Modules']" position="attributes">
-            <attribute name="string">Configure</attribute>
-          </xpath>
-            <group colspan="8">
-            <group colspan="4" col="4" groups="base.group_extended" name="other">
-                  <field name="crm_claim" />
-                  <field name="crm_helpdesk" />
-                  <field name="crm_fundraising" />
-                  <field name="wiki_sale_faq"/>
-                    <field name="sale_crm" invisible="1"/>
+          <xpath expr="//field[@name='product_expiry']" position="after">
+            <newline/>
+            <group attrs="{'invisible': [('crm', '=', False)]}" colspan="4">
+                <separator  string="Customer Relationship Management Details" colspan="4" />
             </group>
-            <group colspan="2" col="2">
-                <separator string="Synchronization" colspan="4" />
-                <field name="crm_caldav" />
-                <field name="fetchmail" />
-            </group>
-            <group colspan="2" col="2">
-              <separator string="Plug-In" colspan="4" />
-                  <field name="thunderbird" />
-                  <field name="outlook" />
-              </group>
-          </group>
+                <field name="crm_claim" groups="base.group_extended" attrs="{'invisible': [('crm', '=', False)]}"/>
+                <field name="crm_helpdesk" groups="base.group_extended" attrs="{'invisible': [('crm', '=', False)]}"/>
+                <field name="crm_fundraising" groups="base.group_extended" attrs="{'invisible': [('crm', '=', False)]}"/>
+                <field name="wiki_sale_faq" groups="base.group_extended" attrs="{'invisible': [('crm', '=', False)]}"/>
+                <field name="sale_crm" invisible="1" groups="base.group_extended" attrs="{'invisible': [('crm', '=', False)]}"/>
+                <field name="crm_caldav" attrs="{'invisible': [('crm', '=', False)]}"/>
+                <field name="fetchmail" attrs="{'invisible': [('crm', '=', False)]}"/>
+                <field name="thunderbird" attrs="{'invisible': [('crm', '=', False)]}"/>
+                <field name="outlook" attrs="{'invisible': [('crm', '=', False)]}"/>
+          </xpath>
         </data>
       </field>
     </record>
-
-    <record id="action_crm_installer" model="ir.actions.act_window">
-      <field name="name">CRM Application Configuration</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">crm.installer</field>
-      <field name="view_id" ref="view_crm_installer"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="target">new</field>
-    </record>
-
-    <record id="crm_installer_todo" model="ir.actions.todo">
-        <field name="action_id" ref="action_crm_installer"/>
-        <field name="sequence">3</field>
-        <field name="type">special</field>
-        <field eval="[(6,0,[ref('base.group_extended')])]" name="groups_id"/>
-    </record>
-
+    
     <record model="ir.actions.act_window" id="crm_case_section_view_form_installer">
         <field name="name">Create sales team</field>
         <field name="type">ir.actions.act_window</field>