From 395ee2bc8ec4b82f13441ed6bb9d2c2aaf074cd2 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Mon, 5 Nov 2012 11:33:10 +0530
Subject: [PATCH 1/3] [FIX]:Remove selection widget and add ir.action.todo

bzr revid: aja@tinyerp.com-20121105060310-s3uw9o6vmjz37xwu
---
 addons/crm/crm_lead_view.xml         |  4 ++--
 addons/marketing/res_config_view.xml | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 5ff1bc15f69..8afe169c964 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -210,7 +210,7 @@
                                 <field name="company_id"
                                     groups="base.group_multi_company"
                                     widget="selection" colspan="2" />
-                                <field name="type_id" widget="selection"/>
+                                <field name="type_id" />
                                 <field name="channel_id" widget="selection"/>
                                 <field name="referred"/>
                                 <field name="state" groups="base.group_no_one"/>
@@ -496,7 +496,7 @@
                                 </group>
 
                                 <group string="Categorization">
-                                    <field name="type_id" widget="selection"/>
+                                    <field name="type_id" />
                                     <field name="channel_id" widget="selection"/>
                                 </group>
                                 <group string="Mailings">
diff --git a/addons/marketing/res_config_view.xml b/addons/marketing/res_config_view.xml
index 78144843f82..73095a690db 100644
--- a/addons/marketing/res_config_view.xml
+++ b/addons/marketing/res_config_view.xml
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
+    <data noupdate="1">
+
+        <record id="action_client_marketing_menu" model="ir.actions.client">
+            <field name="name">Open Marketing Menu</field>
+            <field name="tag">reload</field>
+            <field name="params" eval="{'menu_id': ref('base.marketing_menu')}"/>
+        </record>
+
+        <record id="base.open_menu" model="ir.actions.todo">
+            <field name="action_id" ref="action_client_marketing_menu"/>
+            <field name="state">open</field>
+        </record>
+
+    </data>
     <data>
 
         <record id="view_marketing_configuration" model="ir.ui.view">

From c1478cddbe65baf1f982060b47af41e487121076 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 7 Nov 2012 10:48:53 +0530
Subject: [PATCH 2/3] [IMP] move contacts segmentation menu in marketing

bzr revid: tpa@tinyerp.com-20121107051853-j9v9vnydlyowoj9w
---
 addons/crm/crm_view.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 5e2034d6373..9daa74e009c 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -422,10 +422,17 @@
             </field>
         </record>
 
+       <!-- Top menu item of marketnig-->
+        <menuitem name="Marketing"
+            id="base.marketing_menu"
+            sequence="120"/>
+
+       <menuitem name="Configuration" id="menu_marketing_configuration" parent="base.marketing_menu" sequence="120"/>
+
        <menuitem action="crm_segmentation_tree-act"
             id="menu_crm_segmentation-act"
             groups="base.group_no_one" sequence="15"
-            parent="base.menu_base_config" />
+            parent="menu_marketing_configuration" />
 
         <!-- menu for the working time -->
         <menuitem action="resource.action_resource_calendar_form" id="menu_action_resource_calendar_form" parent="resource.menu_resource_config" sequence="1"/>

From 85744afe7f98b92193615e06e5df0335439028e8 Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Wed, 21 Nov 2012 10:42:45 +0530
Subject: [PATCH 3/3] [FIX] Open marketing on campaign

bzr revid: jam@tinyerp.com-20121121051245-y37c4heicus8sdo9
---
 addons/crm/crm_lead_view.xml                       |  2 +-
 addons/marketing/res_config_view.xml               | 14 --------------
 .../marketing_campaign/marketing_campaign_view.xml | 14 ++++++++++++++
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 5e67908b790..fb806b3393a 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -210,7 +210,7 @@
                                 <field name="company_id"
                                     groups="base.group_multi_company"
                                     widget="selection" colspan="2"/>
-                                <field name="type_id" widget="selection"/>
+                                <field name="type_id"/>
                                 <field name="channel_id" widget="selection"/>
                                 <field name="referred"/>
                                 <field name="state" groups="base.group_no_one"/>
diff --git a/addons/marketing/res_config_view.xml b/addons/marketing/res_config_view.xml
index 73095a690db..78144843f82 100644
--- a/addons/marketing/res_config_view.xml
+++ b/addons/marketing/res_config_view.xml
@@ -1,19 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
-
-        <record id="action_client_marketing_menu" model="ir.actions.client">
-            <field name="name">Open Marketing Menu</field>
-            <field name="tag">reload</field>
-            <field name="params" eval="{'menu_id': ref('base.marketing_menu')}"/>
-        </record>
-
-        <record id="base.open_menu" model="ir.actions.todo">
-            <field name="action_id" ref="action_client_marketing_menu"/>
-            <field name="state">open</field>
-        </record>
-
-    </data>
     <data>
 
         <record id="view_marketing_configuration" model="ir.ui.view">
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index ab45f802371..2b479be709c 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -1,5 +1,19 @@
 <?xml version="1.0"?>
 <openerp>
+    <data noupdate="1">
+
+        <record id="action_client_marketing_menu" model="ir.actions.client">
+            <field name="name">Open Marketing Menu</field>
+            <field name="tag">reload</field>
+            <field name="params" eval="{'menu_id': ref('base.marketing_menu')}"/>
+        </record>
+
+        <record id="base.open_menu" model="ir.actions.todo">
+            <field name="action_id" ref="action_client_marketing_menu"/>
+            <field name="state">open</field>
+        </record>
+
+    </data>
     <data>
 
     <menuitem name="Configuration" id="menu_marketing_configuration" parent="base.marketing_menu" sequence="1"/>