From cf4f258306381903ecc20dd972b607888053d662 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 19 Jul 2012 14:12:03 +0530
Subject: [PATCH 1/2] [IMP]crm: improve button sequence and fix value error on
 button and improve name of view

bzr revid: mma@tinyerp.com-20120719084203-ww4pc42oz2rnma3e
---
 addons/crm/crm_lead_menu.xml      |  2 +-
 addons/crm/crm_lead_view.xml      |  4 +---
 addons/crm/crm_phonecall_view.xml | 16 +++++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index cbcd5b3b3bd..fde288c4a45 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -41,7 +41,7 @@
     </record>
 
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
-          <field name="name">Opportunities</field>
+          <field name="name">Opportunity</field>
           <field name="res_model">crm.lead</field>
           <field name="view_mode">kanban,tree,form,graph,calendar</field>
           <field name="domain">[('type','=','opportunity')]</field>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 73c687e4ad0..f7bd27854f1 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -97,8 +97,7 @@
                 groups="base.group_sale_salesman"
                 res_model="crm.phonecall"
                 view_mode="tree,calendar,form"
-                context="{'default_duration': 1.0 ,'default_opportunity_id': active_id,'default_partner_phone':phone}"
-                domain="[('opportunity_id', '=', active_id)]"
+                context="{'default_duration': 1.0 ,'default_opportunity_id': active_id}"
                 view_type="form"/>
 
         <act_window
@@ -107,7 +106,6 @@
                 res_model="crm.meeting"
                 view_mode="tree,form,calendar"
                 context="{'default_duration': 4.0, 'default_opportunity_id': active_id}"
-                domain="[('opportunity_id', '=', active_id)]"
                 view_type="form"/>
 
 
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 1f15e29263b..e83ad45d851 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -101,23 +101,25 @@
         <field name="arch" type="xml">
             <form version="7.0">
             <header>
-                <button name="case_open" string="Confirm" type="object" class="oe_highlight"
-                        states="draft,pending"/>
                 <button name="case_close" string="Held" type="object" class="oe_highlight"
                         states="open,pending"/>
                 <button name="case_reset" string="Reset to Todo" type="object"
                         states="cancel"/>
-                <button name="case_cancel" string="Cancel" type="object"
-                        states="draft,open,pending"/>
-                <button string="Convert to Opportunity"  class="oe_highlight"
+                <button string="Convert to Opportunity"
                         name="%(phonecall2opportunity_act)d"
                         type="action"
-                        attrs="{'invisible':[('opportunity_id','!=',False)]}" />
+                        attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state','!=', 'open')]}" />
+                <button string="Convert to Opportunity" class="oe_highlight"
+                        name="%(phonecall2opportunity_act)d"
+                        type="action"
+                        attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state','!=', 'done')]}" />
                 <button string="Schedule Other Call"
                         name="%(phonecall_to_phonecall_act)d"
                         type="action"  />
                 <button string="Schedule a Meeting" name="action_make_meeting" type="object"/>
-                <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done"/>
+                <button name="case_cancel" string="Cancel" type="object"
+                        states="draft,open,pending"/>
+                <field name="state" widget="statusbar" nolabel="1" statusbar_visible="open,done"/>
             </header>
             <sheet string="Phone Call">
                   <div class="oe_title">

From 459ef0a9d9c2998550b3090ad238763daa40f058 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Thu, 19 Jul 2012 12:34:19 +0200
Subject: [PATCH 2/2] [FIX] crm: change the name of the action

bzr revid: stw@openerp.com-20120719103419-gtx93tuedw5imyah
---
 addons/crm/crm_lead_menu.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index fde288c4a45..cbcd5b3b3bd 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -41,7 +41,7 @@
     </record>
 
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
-          <field name="name">Opportunity</field>
+          <field name="name">Opportunities</field>
           <field name="res_model">crm.lead</field>
           <field name="view_mode">kanban,tree,form,graph,calendar</field>
           <field name="domain">[('type','=','opportunity')]</field>