From 3717146dc47e2a36369917c2014c63199e51d96a Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Thu, 29 Nov 2012 19:10:18 +0530
Subject: [PATCH] [IMP] Channel_id and type field displayed if marketing module
 installed and in lead form reffered field put inside Misc section.

bzr revid: bth@tinyerp.com-20121129134018-jpo0huhe4ca87466
---
 addons/crm/crm_lead_view.xml        | 12 ++++--------
 addons/marketing/__openerp__.py     |  2 +-
 addons/marketing/marketing_view.xml | 28 +++++++++++++++++++++++++++-
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 88b2edcd665..5986dcb934b 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -210,14 +210,15 @@
                                 <field name="company_id"
                                     groups="base.group_multi_company"
                                     widget="selection" colspan="2"/>
-                                <field name="type_id"/>
-                                <field name="channel_id" widget="selection"/>
-                                <field name="referred"/>
                                 <field name="state" groups="base.group_no_one"/>
                             </group>
                             <group string="Mailings">
                                 <field name="opt_out"/>
                             </group>
+                            <group string="Misc">
+                                <field name="active"/>
+                                <field name="referred"/>
+                            </group>
                         </group>
                     </page>
                     </notebook>
@@ -496,11 +497,6 @@
                                     <field name="mobile"/>
                                     <field name="fax"/>
                                 </group>
-
-                                <group string="Categorization">
-                                    <field name="type_id" />
-                                    <field name="channel_id" widget="selection"/>
-                                </group>
                                 <group string="Mailings">
                                     <field name="opt_out"/>
                                 </group>
diff --git a/addons/marketing/__openerp__.py b/addons/marketing/__openerp__.py
index 0c77fe59a86..e46c58b9959 100644
--- a/addons/marketing/__openerp__.py
+++ b/addons/marketing/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Marketing',
     'version': '1.1',
-    'depends': ['base', 'base_setup'],
+    'depends': ['base', 'base_setup', 'crm'],
     'author': 'OpenERP SA',
     'category': 'Hidden/Dependency',
     'description': """
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index 965818cf65e..f6753e733cd 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -7,6 +7,32 @@
             id="base.marketing_menu"
             groups="marketing.group_marketing_user,marketing.group_marketing_manager"
             sequence="85"/>
-
+         <record id="view_crm_lead_form" model="ir.ui.view">
+            <field name="name">crm.lead.inherit.form</field>
+            <field name="model">crm.lead</field>
+            <field name="inherit_id" ref="crm.crm_case_form_view_leads"/>
+            <field name="arch" type="xml">
+                <xpath expr="//group[@string='Categorization']" position="attributes">
+                    <attribute name="string">Marketing</attribute>
+                </xpath>
+                <xpath expr="//field[@name='company_id']" position="after">
+                    <field name="type_id"/>
+                    <field name="channel_id" widget="selection"/>
+                </xpath>
+            </field>
+        </record>
+        <record id="view_crm_opportunity_form" model="ir.ui.view">
+            <field name="name">crm.lead.inherit.form</field>
+            <field name="model">crm.lead</field>
+            <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
+            <field name="arch" type="xml">
+                <xpath expr="//group[@string='Mailings']" position="before">
+                    <group string="Marketing">
+                        <field name="type_id" />
+                        <field name="channel_id" widget="selection"/>
+                    </group>
+                </xpath>
+            </field>
+        </record>
     </data>
 </openerp>