From d35dec52c31a6d1918328aae5d86841353d1d883 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Thu, 25 Nov 2010 11:32:31 +0530
Subject: [PATCH 1/2] [FIX] crm: Tooltip improved on Phonecall tree view.

lp bug: https://launchpad.net/bugs/680957 fixed

bzr revid: uco@tinyerp.com-20101125060231-btpe7xhqhiaeydl0
---
 addons/crm/crm_phonecall_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 5b796d20b8d..b0e0877b85b 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -33,7 +33,7 @@
                 <field name="user_id"/>
                 <field name="categ_id" string="Type"/>
                 <field name="create_date" invisible="1"/>
-                <button string="Opportunity"
+                <button string="Convert to Opportunity"
                     name="%(phonecall2opportunity_act)d"
                     states="draft,open,pending"
                     icon="gtk-index"
@@ -213,7 +213,7 @@
                     icon="terp-call-start"
                     name="%(phonecall_to_phonecall_act)d"
                     type="action"  />
-                <button string="Opportunity"
+                <button string="Convert to Opportunity"
                     name="%(phonecall2opportunity_act)d"
                     states="draft,open,pending"
                     icon="gtk-index"

From 15dd9e51fab41a1b7e11eaebcf0b1df6380a1db2 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Thu, 25 Nov 2010 12:56:38 +0530
Subject: [PATCH 2/2] [FIX] crm: State changes of all crm object shouldn't be
 in Email section of partner's history. * mail_gateway: Open document should
 only open the related document.

lp bug: https://launchpad.net/bugs/680961 fixed

bzr revid: uco@tinyerp.com-20101125072638-e6gaag8svxvk6hmi
---
 addons/mail_gateway/mail_gateway.py      | 3 ++-
 addons/mail_gateway/res_partner.py       | 2 +-
 addons/mail_gateway/res_partner_view.xml | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index 54bc7862fa4..443d46a4fae 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -200,7 +200,8 @@ class mailgate_message(osv.osv):
                 action_data = action_pool.read(cr, uid, action_ids[0], context=context)
                 action_data.update({
                     'domain' : "[('id','=',%d)]"%(res_id),
-                    'nodestroy': True
+                    'nodestroy': True,
+                    'context': {}
                     })
         return action_data
 
diff --git a/addons/mail_gateway/res_partner.py b/addons/mail_gateway/res_partner.py
index 54bed6a5b56..c6f41ff0414 100644
--- a/addons/mail_gateway/res_partner.py
+++ b/addons/mail_gateway/res_partner.py
@@ -26,7 +26,7 @@ class res_partner(osv.osv):
     _inherit = 'res.partner'
     _columns = {
         'emails': fields.one2many('mailgate.message', 'partner_id',\
-                                        'Emails', readonly=True),
+                                        'Emails', readonly=True, domain=[('history','=',True)]),
     }
 
 res_partner()
diff --git a/addons/mail_gateway/res_partner_view.xml b/addons/mail_gateway/res_partner_view.xml
index dbae434d46f..3cb1bb7fe5a 100644
--- a/addons/mail_gateway/res_partner_view.xml
+++ b/addons/mail_gateway/res_partner_view.xml
@@ -11,7 +11,7 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                  <page string="History" position="inside">
-                      <field name="emails" colspan="4" nolabel="1" domain="[('history', '=', True)]"/>
+                      <field name="emails" colspan="4" nolabel="1"/>
                  </page>
             </field>
        </record>