From fcea928f9a2f87b12bdc03c737fc01c6d2599244 Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Fri, 24 Feb 2012 14:47:22 +0530
Subject: [PATCH 01/10] [FIX] add message_ids field.

bzr revid: bth@tinyerp.com-20120224091722-t7bcv9screonhhbg
---
 addons/crm/crm_lead.py       |  2 +-
 addons/crm/crm_lead_view.xml | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 4a3ae69fba7..c4f59bc83e9 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -189,9 +189,9 @@ class crm_lead(crm_case, osv.osv):
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
                                   \nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
+        'message_ids': fields.one2many('mail.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
         'subjects': fields.function(_get_email_subject, fnct_search=_history_search, string='Subject of Email', type='char', size=64),
 
-
         # Only used for type opportunity
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', domain="[('partner_id','=',partner_id)]"),
         'probability': fields.float('Probability (%)',group_operator="avg"),
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index efeda5ac5fc..5421d628e74 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -147,6 +147,17 @@
                    <group colspan="4">
                        <field colspan="4" name="email_cc" widget="char" size="512"/>
                    </group>
+                   <field name="message_ids" colspan="4" nolabel="1" mode="tree" readonly="1">
+-                        <tree string="History">
+-                            <field name="display_text" string="History Information"/>
+-                            <field name="email_from" invisible="1"/>
+-                            <button
+-                                string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
+-                                name="%(mail.action_email_compose_message_wizard)d"
+-                                context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
+-                                icon="terp-mail-replied" type="action" />
+-                        </tree>
+-                    </field>
                     <button string="Add Internal Note"
                         name="%(crm.action_crm_add_note)d"
                         context="{'model': 'crm.lead' }"

From c232373c4be2e3cab61e1cd1438500131758bcab Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Mon, 27 Feb 2012 12:53:13 +0530
Subject: [PATCH 02/10] [IMP] notification coming when state change from
 pending to open,in progress message is changed,remove need_action_user_id
 from system notification,format apply on notification,for pending
 notification type is checked whether it is lead or opportunity,message
 modified for escalate,in _merge_notification(), replace message_append with
 message_append_note in crm_lead.py,in _convert_opportunity_notification(),
 replace message_append with message_append_note in crm_lead.py, remove log
 and _send_mail_to_salesman(),in write() replace log with message_append_note
 and remove message_append(),add message_ids and message_ids_social field in
 crm lead view of xml,replace log with message_append_note from
 sale_crm/wizard/crm_make_sale.py.

bzr revid: bth@tinyerp.com-20120227072313-etqyoji7101k1zvs
---
 addons/crm/crm_lead.py                  | 59 +++++++++++++------------
 addons/crm/crm_lead_view.xml            | 22 ++++-----
 addons/sale_crm/wizard/crm_make_sale.py |  5 +--
 3 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index c4f59bc83e9..cbab3673d96 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -266,43 +266,46 @@ class crm_lead(crm_case, osv.osv):
         return self.stage_find_percent(cr, uid, 100.0, section_id)
 
     def _case_open_notification(self, lead, context=None):
-        if lead.state != 'draft':
+        if lead.state != 'draft' and lead.state != 'pending':
             return False
         if lead.type == 'lead':
-            message = _("The lead <em>%s</em> has been opened and its state is now in progress. Salesman %s can now set this lead as pending, close it to mark it as done, or cancel it. If there is an opportunity to create from this lead, click on Convert to Opportunity.") % (lead.name, lead.user_id.name)
+            message = _("The lead <em>%s</em> has been opened and its state is now in <b>progress</b>.") % (lead.name)
         elif lead.type == 'opportunity':
-            message = _("The opportunity <em>%s</em> has been opened.") % lead.name
+            message = _("The opportunity <em>%s</em> has been <b>opened</b>.") % lead.name
         else:
-            message = _("The case <em>%s</em> has been opened.") % lead.name
-        lead.message_append_note('' ,message, need_action_user_id=lead.user_id.id)
+            message = _("The case <em>%s</em> has been <b>opened</b>.") % lead.name
+        lead.message_append_note('' ,message)
 
     def _case_close_notification(self, lead, context=None):
         if lead[0].type == 'lead':
-            message = _("The lead <em>%s</em> has been closed.") % lead[0].name
+            message = _("The lead <em>%s</em> has been <b>closed</b>.") % lead[0].name
         else:
-            message = _("The case <em>%s</em> has been closed.") % lead[0].name
+            message = _("The case <em>%s</em> has been <b>closed</b>.") % lead[0].name
 
-        lead[0].message_append_note('' ,message, need_action_user_id=lead[0].user_id.id)
+        lead[0].message_append_note('' ,message)
 
     def _case_mark_lost_notification(self, lead, context=None):
-        message = _("The opportunity <em>%s</em> has been marked as lost.") % lead.name
-        lead.message_append_note('' ,message, need_action_user_id=lead.user_id.id)
+        message = _("The opportunity <em>%s</em> has been <b>marked as lost</b>.") % lead.name
+        lead.message_append_note('' ,message)
 
     def _case_mark_won_notification(self, lead, context=None):
-        message = _("The opportunity <em>%s</em> has been been won.") % lead.name
-        lead.message_append_note('' ,message, need_action_user_id=lead.user_id.id)
+        message = _("The opportunity <em>%s</em> has been been <b>won</b>.") % lead.name
+        lead.message_append_note('' ,message)
 
     def _case_cancel_notification(self, lead, context=None):
-        message = _("The lead <em>%s</em> has been cancelled.") % (lead[0].name)
-        lead[0].message_append_note('' ,message, need_action_user_id=lead[0].user_id.id)
+        message = _("The lead <em>%s</em> has been <b>cancelled</b>.") % (lead[0].name)
+        lead[0].message_append_note('' ,message)
 
     def _case_pending_notification(self, case, context=None):
-        message = _("The lead <em>%s</em> is pending.") % (case[0].name,)
-        case[0].message_append_note('' ,message, need_action_user_id=case[0].user_id.id)
+        if case[0].type == 'lead':
+            message = _("The lead <em>%s</em> is <b>pending</b>.") % (case[0].name,)
+        elif case[0].type == 'opportunity':
+            message = _("The opportunity <em>%s</em> is <b>pending</b>.") % (case[0].name,)
+        case[0].message_append_note('' ,message)
 
     def _case_escalate_notification(self, case, context=None):
-        message = _("The lead <em>%s</em> is pending.") % (case.name,)
-        case.message_append_note('' ,message, need_action_user_id=case.user_id.id)
+        message = _("The lead <em>%s</em> is <b>escalated</b>.") % (case.name,)
+        case.message_append_note('' ,message)
 
     def case_open(self, cr, uid, ids, context=None):
         res = super(crm_lead, self).case_open(cr, uid, ids, context)
@@ -461,7 +464,7 @@ class crm_lead(crm_case, osv.osv):
 
         subject = subject[0] + ", ".join(subject[1:])
         details = "\n\n".join(details)
-        return self.message_append(cr, uid, [opportunity_id], subject, body_text=details, context=context)
+        return opportunity.message_append_note(subject, body_text=details, need_action_user_id=opportunity.user_id.id)
 
     def _merge_opportunity_history(self, cr, uid, opportunity_id, opportunities, context=None):
         message = self.pool.get('mail.message')
@@ -571,10 +574,8 @@ class crm_lead(crm_case, osv.osv):
         }
 
     def _convert_opportunity_notification(self, cr, uid, lead, context=None):
-        success_message = _("Lead '%s' has been converted to an opportunity.") % lead.name
-        self.message_append(cr, uid, [lead.id], success_message, body_text=success_message, context=context)
-        self.log(cr, uid, lead.id, success_message)
-        self._send_mail_to_salesman(cr, uid, lead, context=context)
+        success_message = _("Lead <em>%s</em> has been converted to an <b>opportunity</b>.") % lead.name
+        lead.message_append_note(success_message ,success_message)
         return True
 
     def convert_opportunity(self, cr, uid, ids, partner_id, user_ids=False, section_id=False, context=None):
@@ -867,15 +868,15 @@ class crm_lead(crm_case, osv.osv):
             # change probability of lead(s) if required by stage
             if not vals.get('probability') and stage.on_change:
                 vals['probability'] = stage.probability
-            text = _("Changed Stage to: %s") % stage.name
-            self.message_append(cr, uid, ids, text, body_text=text, context=context)
+            text = _("Changed Stage to: <b>%s</b>") % stage.name
+
             for case in self.browse(cr, uid, ids, context=context):
                 if case.type == 'lead' or context.get('stage_type') == 'lead':
-                    message = _("The stage of lead '%s' has been changed to '%s'.") % (case.name, stage.name)
-                    self.log(cr, uid, case.id, message)
+                    message = _("The stage of lead <em>%s<em> has been changed to <b>%s</b>.") % (case.name, stage.name)
+                    case.message_append_note(text, message)
                 elif case.type == 'opportunity':
-                    message = _("The stage of opportunity '%s' has been changed to '%s'.") % (case.name, stage.name)
-                    self.log(cr, uid, case.id, message)
+                    message = _("The stage of opportunity <em>%s</em> has been changed to <b>%s</b>.") % (case.name, stage.name)
+                    case.message_append_note(text, message)
 
         return super(crm_lead,self).write(cr, uid, ids, vals, context)
 
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index c1eb70ee877..7fd703f0bec 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -148,16 +148,16 @@
                        <field colspan="4" name="email_cc" widget="char" size="512"/>
                    </group>
                    <field name="message_ids" colspan="4" nolabel="1" mode="tree" readonly="1">
--                        <tree string="History">
--                            <field name="display_text" string="History Information"/>
--                            <field name="email_from" invisible="1"/>
--                            <button
--                                string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
--                                name="%(mail.action_email_compose_message_wizard)d"
--                                context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
--                                icon="terp-mail-replied" type="action" />
--                        </tree>
--                    </field>
+                        <tree string="History">
+                            <field name="display_text" string="History Information"/>
+                            <field name="email_from" invisible="1"/>
+                            <button
+                                string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
+                                name="%(mail.action_email_compose_message_wizard)d"
+                                context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
+                                icon="terp-mail-replied" type="action" />
+                        </tree>
+                    </field>
                     <button string="Add Internal Note"
                         name="%(crm.action_crm_add_note)d"
                         context="{'model': 'crm.lead' }"
@@ -195,6 +195,7 @@
                     </group>
                  </page>
                 </notebook>
+                <field name="message_ids_social" widget="ThreadView"/>
             </form>
         </field>
     </record>
@@ -589,6 +590,7 @@
                     <field name="ref2"/>
                 </page>
                 </notebook>
+                <field name="message_ids_social" widget="ThreadView"/>
             </form>
         </field>
     </record>
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index c3515cc5b0b..de9a6d4cd1f 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -106,9 +106,8 @@ class crm_make_sale(osv.osv_memory):
                 sale_order = sale_obj.browse(cr, uid, new_id, context=context)
                 case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id})
                 new_ids.append(new_id)
-                message = _("Opportunity  '%s' is converted to Quotation.") % (case.name)
-                self.log(cr, uid, case.id, message)
-                case_obj.message_append(cr, uid, [case], _("Converted to Sales Quotation(%s).") % (sale_order.name), context=context)
+                message = _("Opportunity  <em>%s</em> is converted to <b>Quotation</b>.") % (case.name)
+                case.message_append_note( _("Converted to Sales Quotation(%s).") % (sale_order.name),message,need_action_user_id=sale_order.user_id.id)
 
             if make.close:
                 case_obj.case_close(cr, uid, data)

From 18e423d9a2577e912bfb141d9a4d93e8df42a021 Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Mon, 27 Feb 2012 16:20:12 +0530
Subject: [PATCH 03/10] [IMP] add notification for meeting and phonecall
 action.replaced notifications methods from crm_case class to crm_base class.

bzr revid: bth@tinyerp.com-20120227105012-01d441d3pqrkvhk7
---
 addons/crm/crm.py      | 31 ++++++++++++++++---------------
 addons/crm/crm_lead.py | 10 ++++++++++
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 292169404a3..6662dd277d1 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -258,7 +258,23 @@ class crm_base(object):
             data.update(self.onchange_partner_address_id(cr, uid, ids, addr['contact'])['value'])
         return {'value': data}
 
+    def _case_open_notification(self, case, context=None):
+        return True
 
+    def _case_close_notification(self, case, context=None):
+        return True
+
+    def _case_cancel_notification(self, case, context=None):
+        return True
+
+    def _case_pending_notification(self, case, context=None):
+        return True
+
+    def _case_escalate_notification(self, case, context=None):
+        return True
+
+    def _case_phonecall_notification(self, case, action, context=None):
+        return True
 
     def case_open(self, cr, uid, ids, context=None):
         """Opens Case
@@ -392,21 +408,6 @@ class crm_case(crm_base):
                 default.update({ 'date_open': False })
         return super(crm_case, self).copy(cr, uid, id, default, context=context)
 
-    def _case_open_notification(self, case, context=None):
-        return True
-
-    def _case_close_notification(self, case, context=None):
-        return True
-
-    def _case_cancel_notification(self, case, context=None):
-        return True
-
-    def _case_pending_notification(self, case, context=None):
-        return True
-
-    def _case_escalate_notification(self, case, context=None):
-        return True
-
     def case_open(self, cr, uid, ids, context=None):
         """Opens Case"""
         cases = self.browse(cr, uid, ids)
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index cbab3673d96..b08fcdb78eb 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -307,6 +307,14 @@ class crm_lead(crm_case, osv.osv):
         message = _("The lead <em>%s</em> is <b>escalated</b>.") % (case.name,)
         case.message_append_note('' ,message)
 
+    def _case_phonecall_notification(self, case, action, context=None):
+        message = _("<b>%s a call</b> for the opportunity <em>%s</em>.") % (action,case.name)
+        case.message_append_note('', message, need_action_user_id=case.user_id.id)
+
+    def _case_opportunity_meeting_notification(self, case, context=None):
+        message = _("The opportunity <em>%s</em> is scheduled for <b>meeting</b>.") % (case.name)
+        case.message_append_note('', message, need_action_user_id=case.user_id.id)
+
     def case_open(self, cr, uid, ids, context=None):
         res = super(crm_lead, self).case_open(cr, uid, ids, context)
         for lead in self.browse(cr, uid, ids, context=context):
@@ -727,6 +735,7 @@ class crm_lead(crm_case, osv.osv):
             if action == 'log':
                 phonecall.case_close(cr, uid, [new_id])
             phonecall_dict[lead.id] = new_id
+            self._case_phonecall_notification(lead,action,context=context)
         return phonecall_dict
 
 
@@ -844,6 +853,7 @@ class crm_lead(crm_case, osv.osv):
                 'search_view_id': search_view and search_view[1] or False,
                 'nodestroy': True
             }
+            self._case_opportunity_meeting_notification(opp,context=context)
         return value
 
 

From 76950baec78b64d5a33a46ad55eabf19c6d799f3 Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Tue, 28 Feb 2012 11:20:38 +0530
Subject: [PATCH 04/10] [IMP] When creating a lead notification put,subscribin
 when create a lead,when close,cancel,lost,won lead at that time need action
 is removed.

bzr revid: bth@tinyerp.com-20120228055038-7rekfl8whlhgf12h
---
 addons/crm/crm_lead.py | 61 ++++++++++++++++++++++++++----------------
 1 file changed, 38 insertions(+), 23 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index b08fcdb78eb..9868689dcc5 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -224,6 +224,12 @@ class crm_lead(crm_case, osv.osv):
         'color': 0,
     }
 
+    def create(self, cr, uid, vals, context=None):
+        obj_id = super(crm_lead, self).create(cr, uid, vals, context)
+        self._case_create_notification(cr, uid, [obj_id], context=context)
+        return obj_id
+
+
     def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
         """This function returns value of partner email based on Partner Address
         """
@@ -265,54 +271,64 @@ class crm_lead(crm_case, osv.osv):
     def stage_find_won(self, cr, uid, section_id):
         return self.stage_find_percent(cr, uid, 100.0, section_id)
 
+    def _case_create_notification(self, cr, uid, ids, context=None):
+        for obj in self.browse(cr, uid, ids, context=context):
+            self.message_subscribe(cr, uid, ids, [obj.user_id.id], context=context)
+            self.message_append_note(cr, uid, ids, _('System notification'),
+                        _("Lead %s is Created.") % (obj.name), type='notification', need_action_user_id=obj.user_id.id, context=context)
+        return True
+
     def _case_open_notification(self, lead, context=None):
         if lead.state != 'draft' and lead.state != 'pending':
             return False
         if lead.type == 'lead':
-            message = _("The lead <em>%s</em> has been opened and its state is now in <b>progress</b>.") % (lead.name)
+            message = _("The lead %s has been opened.") % (lead.name)
         elif lead.type == 'opportunity':
-            message = _("The opportunity <em>%s</em> has been <b>opened</b>.") % lead.name
+            message = _("The opportunity %s has been opened.") % lead.name
         else:
-            message = _("The case <em>%s</em> has been <b>opened</b>.") % lead.name
-        lead.message_append_note('' ,message)
+            message = _("The case %s has been opened.") % lead.name
+        lead.message_append_note('' ,message, need_action_user_id=lead.user_id.id)
 
     def _case_close_notification(self, lead, context=None):
+        lead[0].message_mark_done(context)
         if lead[0].type == 'lead':
-            message = _("The lead <em>%s</em> has been <b>closed</b>.") % lead[0].name
+            message = _("The lead %s has been closed.") % lead[0].name
         else:
-            message = _("The case <em>%s</em> has been <b>closed</b>.") % lead[0].name
-
+            message = _("The case %s has been closed.") % lead[0].name
         lead[0].message_append_note('' ,message)
 
     def _case_mark_lost_notification(self, lead, context=None):
-        message = _("The opportunity <em>%s</em> has been <b>marked as lost</b>.") % lead.name
+        lead.message_mark_done(context)
+        message = _("The opportunity %s has been marked as lost.") % lead.name
         lead.message_append_note('' ,message)
 
     def _case_mark_won_notification(self, lead, context=None):
-        message = _("The opportunity <em>%s</em> has been been <b>won</b>.") % lead.name
+        lead.message_mark_done(context)
+        message = _("The opportunity %s has been been won.") % lead.name
         lead.message_append_note('' ,message)
 
     def _case_cancel_notification(self, lead, context=None):
-        message = _("The lead <em>%s</em> has been <b>cancelled</b>.") % (lead[0].name)
+        lead[0].message_mark_done(context)
+        message = _("The lead %s has been cancelled.") % (lead[0].name)
         lead[0].message_append_note('' ,message)
 
     def _case_pending_notification(self, case, context=None):
         if case[0].type == 'lead':
-            message = _("The lead <em>%s</em> is <b>pending</b>.") % (case[0].name,)
+            message = _("The lead %s is pending.") % (case[0].name,)
         elif case[0].type == 'opportunity':
-            message = _("The opportunity <em>%s</em> is <b>pending</b>.") % (case[0].name,)
-        case[0].message_append_note('' ,message)
+            message = _("The opportunity %s is pending.") % (case[0].name,)
+        case[0].message_append_note('' ,message, need_action_user_id=case[0].user_id.id)
 
     def _case_escalate_notification(self, case, context=None):
-        message = _("The lead <em>%s</em> is <b>escalated</b>.") % (case.name,)
+        message = _("The lead %s is escalated.") % (case.name,)
         case.message_append_note('' ,message)
 
     def _case_phonecall_notification(self, case, action, context=None):
-        message = _("<b>%s a call</b> for the opportunity <em>%s</em>.") % (action,case.name)
+        message = _("%s a call for the opportunity %s.") % (action,case.name)
         case.message_append_note('', message, need_action_user_id=case.user_id.id)
 
     def _case_opportunity_meeting_notification(self, case, context=None):
-        message = _("The opportunity <em>%s</em> is scheduled for <b>meeting</b>.") % (case.name)
+        message = _("The opportunity %s is scheduled for meeting.") % (case.name)
         case.message_append_note('', message, need_action_user_id=case.user_id.id)
 
     def case_open(self, cr, uid, ids, context=None):
@@ -354,7 +370,6 @@ class crm_lead(crm_case, osv.osv):
             stage_id = self.stage_find_lost(cr, uid, lead.section_id.id or False)
             if stage_id:
                 self.stage_set(cr, uid, [lead.id], stage_id)
-            self._case_mark_lost_notification(lead, context=context)
         return res
 
     def case_mark_won(self, cr, uid, ids, context=None):
@@ -472,7 +487,7 @@ class crm_lead(crm_case, osv.osv):
 
         subject = subject[0] + ", ".join(subject[1:])
         details = "\n\n".join(details)
-        return opportunity.message_append_note(subject, body_text=details, need_action_user_id=opportunity.user_id.id)
+        return opportunity.message_append_note(subject, body=details, need_action_user_id=opportunity.user_id.id)
 
     def _merge_opportunity_history(self, cr, uid, opportunity_id, opportunities, context=None):
         message = self.pool.get('mail.message')
@@ -582,8 +597,8 @@ class crm_lead(crm_case, osv.osv):
         }
 
     def _convert_opportunity_notification(self, cr, uid, lead, context=None):
-        success_message = _("Lead <em>%s</em> has been converted to an <b>opportunity</b>.") % lead.name
-        lead.message_append_note(success_message ,success_message)
+        success_message = _("Lead %s has been converted to an opportunity.") % lead.name
+        lead.message_append_note(success_message ,success_message, need_action_user_id=lead.user_id.id)
         return True
 
     def convert_opportunity(self, cr, uid, ids, partner_id, user_ids=False, section_id=False, context=None):
@@ -878,14 +893,14 @@ class crm_lead(crm_case, osv.osv):
             # change probability of lead(s) if required by stage
             if not vals.get('probability') and stage.on_change:
                 vals['probability'] = stage.probability
-            text = _("Changed Stage to: <b>%s</b>") % stage.name
+            text = _("Changed Stage to: %s") % stage.name
 
             for case in self.browse(cr, uid, ids, context=context):
                 if case.type == 'lead' or context.get('stage_type') == 'lead':
-                    message = _("The stage of lead <em>%s<em> has been changed to <b>%s</b>.") % (case.name, stage.name)
+                    message = _("The stage of lead %s has been changed to %s.") % (case.name, stage.name)
                     case.message_append_note(text, message)
                 elif case.type == 'opportunity':
-                    message = _("The stage of opportunity <em>%s</em> has been changed to <b>%s</b>.") % (case.name, stage.name)
+                    message = _("The stage of opportunity %s has been changed to %s.") % (case.name, stage.name)
                     case.message_append_note(text, message)
 
         return super(crm_lead,self).write(cr, uid, ids, vals, context)

From cafffbfb467dea692e090b81bd7fb372b782e51f Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Tue, 28 Feb 2012 11:25:37 +0530
Subject: [PATCH 05/10] [FIX] Remove <em> and <b> tags from notification
 messages it is not working so removed.

bzr revid: bth@tinyerp.com-20120228055537-asmg2uiuuwssgpex
---
 addons/sale_crm/wizard/crm_make_sale.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index de9a6d4cd1f..fe338b0585f 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -106,7 +106,7 @@ class crm_make_sale(osv.osv_memory):
                 sale_order = sale_obj.browse(cr, uid, new_id, context=context)
                 case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id})
                 new_ids.append(new_id)
-                message = _("Opportunity  <em>%s</em> is converted to <b>Quotation</b>.") % (case.name)
+                message = _("Opportunity %s is converted to Quotation.") % (case.name)
                 case.message_append_note( _("Converted to Sales Quotation(%s).") % (sale_order.name),message,need_action_user_id=sale_order.user_id.id)
 
             if make.close:

From c763083fc4a61425352a1088ff762d8e14bfd7c7 Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Tue, 28 Feb 2012 13:15:27 +0530
Subject: [PATCH 06/10] [FIX] remove lead and opportuniy name from notification
 messages,apply bold tag on stages,put quotation name when converted in
 quotation from opportunity,put need action only in create and open stage.

bzr revid: bth@tinyerp.com-20120228074527-j53q7ulkyhb1uxib
---
 addons/crm/crm_lead.py                  | 33 ++++++++++++++-----------
 addons/sale_crm/wizard/crm_make_sale.py |  2 +-
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 9868689dcc5..f166897a2cb 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -275,52 +275,57 @@ class crm_lead(crm_case, osv.osv):
         for obj in self.browse(cr, uid, ids, context=context):
             self.message_subscribe(cr, uid, ids, [obj.user_id.id], context=context)
             self.message_append_note(cr, uid, ids, _('System notification'),
-                        _("Lead %s is Created.") % (obj.name), type='notification', need_action_user_id=obj.user_id.id, context=context)
+                        _("Lead is <b>created</b>."), type='notification', need_action_user_id=obj.user_id.id, context=context)
         return True
 
     def _case_open_notification(self, lead, context=None):
         if lead.state != 'draft' and lead.state != 'pending':
             return False
         if lead.type == 'lead':
-            message = _("The lead %s has been opened.") % (lead.name)
+            message = _("The lead has been <b>opened</b>.")
         elif lead.type == 'opportunity':
-            message = _("The opportunity %s has been opened.") % lead.name
+            message = _("The opportunity has been <b>opened</b>.")
         else:
-            message = _("The case %s has been opened.") % lead.name
+            message = _("The case has been <b>opened</b>.")
         lead.message_append_note('' ,message, need_action_user_id=lead.user_id.id)
 
     def _case_close_notification(self, lead, context=None):
         lead[0].message_mark_done(context)
         if lead[0].type == 'lead':
-            message = _("The lead %s has been closed.") % lead[0].name
+            message = _("The lead has been <b>closed</b>.")
+        elif lead[0].type == 'opportunity':
+            message = _("The opportunity has been <b>closed</b>.")
         else:
-            message = _("The case %s has been closed.") % lead[0].name
+            message = _("The case has been <b>closed</b>.")
         lead[0].message_append_note('' ,message)
 
     def _case_mark_lost_notification(self, lead, context=None):
         lead.message_mark_done(context)
-        message = _("The opportunity %s has been marked as lost.") % lead.name
+        message = _("The opportunity has been <b>marked as lost</b>.")
         lead.message_append_note('' ,message)
 
     def _case_mark_won_notification(self, lead, context=None):
         lead.message_mark_done(context)
-        message = _("The opportunity %s has been been won.") % lead.name
+        message = _("The opportunity has been <b>won</b>.")
         lead.message_append_note('' ,message)
 
     def _case_cancel_notification(self, lead, context=None):
         lead[0].message_mark_done(context)
-        message = _("The lead %s has been cancelled.") % (lead[0].name)
+        if lead[0].type == 'lead':
+            message = _("The lead has been <b>cancelled</b>.")
+        elif lead[0].type == 'opportunity':
+            message = _("The opportunity has been <b>cancelled</b>.")
         lead[0].message_append_note('' ,message)
 
     def _case_pending_notification(self, case, context=None):
         if case[0].type == 'lead':
-            message = _("The lead %s is pending.") % (case[0].name,)
+            message = _("The lead is <b>pending</b>.")
         elif case[0].type == 'opportunity':
-            message = _("The opportunity %s is pending.") % (case[0].name,)
-        case[0].message_append_note('' ,message, need_action_user_id=case[0].user_id.id)
+            message = _("The opportunity is <b>pending</b>.")
+        case[0].message_append_note('' ,message)
 
     def _case_escalate_notification(self, case, context=None):
-        message = _("The lead %s is escalated.") % (case.name,)
+        message = _("The lead is <b>escalated</b>.")
         case.message_append_note('' ,message)
 
     def _case_phonecall_notification(self, case, action, context=None):
@@ -597,7 +602,7 @@ class crm_lead(crm_case, osv.osv):
         }
 
     def _convert_opportunity_notification(self, cr, uid, lead, context=None):
-        success_message = _("Lead %s has been converted to an opportunity.") % lead.name
+        success_message = _("Lead is <b>converted to an opportunity</b>.")
         lead.message_append_note(success_message ,success_message, need_action_user_id=lead.user_id.id)
         return True
 
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index fe338b0585f..1d898c5cc8d 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -106,7 +106,7 @@ class crm_make_sale(osv.osv_memory):
                 sale_order = sale_obj.browse(cr, uid, new_id, context=context)
                 case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id})
                 new_ids.append(new_id)
-                message = _("Opportunity %s is converted to Quotation.") % (case.name)
+                message = _("Opportunity %s is converted to Quotation %s.") % (case.name, sale_order.name)
                 case.message_append_note( _("Converted to Sales Quotation(%s).") % (sale_order.name),message,need_action_user_id=sale_order.user_id.id)
 
             if make.close:

From e04c1215eac395f9c77edb89b237d29d1fa7d416 Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Tue, 28 Feb 2012 19:08:04 +0530
Subject: [PATCH 07/10] [IMP] put a date for schedule a call
 notification,meeting notification with date in crm lead and notification with
 need action in crm meeting,conert phonecall into opportunity notification
 put.

bzr revid: bth@tinyerp.com-20120228133804-cbynhdwlw4pf1wg2
---
 addons/crm/crm.py            |  3 +++
 addons/crm/crm_lead.py       | 27 +++++++++++++++------------
 addons/crm/crm_lead_view.xml | 33 +++------------------------------
 addons/crm/crm_meeting.py    | 15 +++++++++++++++
 addons/crm/crm_phonecall.py  | 11 ++++++++---
 5 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 6662dd277d1..27f50a0adb8 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -258,6 +258,9 @@ class crm_base(object):
             data.update(self.onchange_partner_address_id(cr, uid, ids, addr['contact'])['value'])
         return {'value': data}
 
+    def _case_opportunity_meeting_notification(self, cr, uid, ids, context=None):
+        return True
+
     def _case_open_notification(self, case, context=None):
         return True
 
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index f166897a2cb..ef9eff16eac 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -274,8 +274,12 @@ class crm_lead(crm_case, osv.osv):
     def _case_create_notification(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
             self.message_subscribe(cr, uid, ids, [obj.user_id.id], context=context)
+            if obj.type=="opportunity" and obj.state=="draft":
+                message = _("Opportunity is <b>created</b>.")
+            elif obj.type=="lead" :
+                message = _("Lead is <b>created</b>.")
             self.message_append_note(cr, uid, ids, _('System notification'),
-                        _("Lead is <b>created</b>."), type='notification', need_action_user_id=obj.user_id.id, context=context)
+                        message, type='notification', need_action_user_id=obj.user_id.id, context=context)
         return True
 
     def _case_open_notification(self, lead, context=None):
@@ -328,13 +332,13 @@ class crm_lead(crm_case, osv.osv):
         message = _("The lead is <b>escalated</b>.")
         case.message_append_note('' ,message)
 
-    def _case_phonecall_notification(self, case, action, context=None):
-        message = _("%s a call for the opportunity %s.") % (action,case.name)
-        case.message_append_note('', message, need_action_user_id=case.user_id.id)
-
-    def _case_opportunity_meeting_notification(self, case, context=None):
-        message = _("The opportunity %s is scheduled for meeting.") % (case.name)
-        case.message_append_note('', message, need_action_user_id=case.user_id.id)
+    def _case_phonecall_notification(self, cr, uid, ids, case, phonecall, action, context=None):
+        for obj in phonecall.browse(cr, uid, ids, context=context):
+            if action == "schedule" :
+                message = _("<b>%s a call</b> for the %s.") % (action, obj.date)
+            else :
+                message = _("<b>%s a call</b>.") % (action)
+            case.message_append_note('', message)
 
     def case_open(self, cr, uid, ids, context=None):
         res = super(crm_lead, self).case_open(cr, uid, ids, context)
@@ -755,7 +759,7 @@ class crm_lead(crm_case, osv.osv):
             if action == 'log':
                 phonecall.case_close(cr, uid, [new_id])
             phonecall_dict[lead.id] = new_id
-            self._case_phonecall_notification(lead,action,context=context)
+            self._case_phonecall_notification(cr, uid, [new_id], lead, phonecall, action, context=context)
         return phonecall_dict
 
 
@@ -873,7 +877,6 @@ class crm_lead(crm_case, osv.osv):
                 'search_view_id': search_view and search_view[1] or False,
                 'nodestroy': True
             }
-            self._case_opportunity_meeting_notification(opp,context=context)
         return value
 
 
@@ -902,10 +905,10 @@ class crm_lead(crm_case, osv.osv):
 
             for case in self.browse(cr, uid, ids, context=context):
                 if case.type == 'lead' or context.get('stage_type') == 'lead':
-                    message = _("The stage of lead %s has been changed to %s.") % (case.name, stage.name)
+                    message = _("The stage of lead has been changed to <b>%s</b>.") % (stage.name)
                     case.message_append_note(text, message)
                 elif case.type == 'opportunity':
-                    message = _("The stage of opportunity %s has been changed to %s.") % (case.name, stage.name)
+                    message = _("The stage of opportunity has been changed to <b>%s</b>.") % (stage.name)
                     case.message_append_note(text, message)
 
         return super(crm_lead,self).write(cr, uid, ids, vals, context)
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 7fd703f0bec..699b11b9bfe 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -77,6 +77,9 @@
                             icon="gtk-go-forward" context="{'stage_type': 'lead'}" />
                     </group>
                     <field name="type" invisible="1"/>
+                    <button string="Send New Email"
+                        name="%(mail.action_email_compose_message_wizard)d"
+                        icon="terp-mail-message-new" type="action"/>
                 </group>
                 <notebook colspan="4">
                 <page string="Lead">
@@ -143,29 +146,6 @@
                             type="object" icon="gtk-convert" />
                     </group>
                  </page>
-                 <page string="Communication &amp; History" groups="base.group_extended">
-                   <group colspan="4">
-                       <field colspan="4" name="email_cc" widget="char" size="512"/>
-                   </group>
-                   <field name="message_ids" colspan="4" nolabel="1" mode="tree" readonly="1">
-                        <tree string="History">
-                            <field name="display_text" string="History Information"/>
-                            <field name="email_from" invisible="1"/>
-                            <button
-                                string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
-                                name="%(mail.action_email_compose_message_wizard)d"
-                                context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
-                                icon="terp-mail-replied" type="action" />
-                        </tree>
-                    </field>
-                    <button string="Add Internal Note"
-                        name="%(crm.action_crm_add_note)d"
-                        context="{'model': 'crm.lead' }"
-                        icon="terp-document-new" type="action" />
-                    <button string="Send New Email"
-                        name="%(mail.action_email_compose_message_wizard)d"
-                        icon="terp-mail-message-new" type="action"/>
-                 </page>
                  <page string="Extra Info" groups="base.group_extended">
                     <group colspan="2" col="2">
                         <separator string="Categorization" colspan="2" col="2"/>
@@ -176,13 +156,6 @@
                         <field name="channel_id" select="1" widget="selection"/>
                         <field name="referred"/>
                     </group>
-                    <group colspan="2" col="2">
-                        <separator string="Dates" colspan="2" col="2"/>
-                        <field name="create_date"/>
-                        <field name="write_date"/>
-                        <field name="date_open"/>
-                        <field name="date_closed"/>
-                    </group>
                     <group colspan="2" col="2">
                         <separator string="Mailings" colspan="2" col="2"/>
                         <field name="optin" on_change="on_change_optin(optin)"/>
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 40ba8662f13..5ba93d526af 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -80,6 +80,21 @@ class crm_meeting(crm_base, osv.osv):
         'user_id': lambda self, cr, uid, ctx: uid,
     }
 
+    def create(self, cr, uid, vals, context=None):
+        obj_id = super(crm_meeting, self).create(cr, uid, vals, context=context)
+        self._case_opportunity_meeting_notification(cr, uid, [obj_id], context=context)
+        return obj_id
+
+    def _case_opportunity_meeting_notification(self, cr, uid, ids, context=None):
+        lead_obj = self.pool.get('crm.lead')
+
+        for obj in self.browse(cr, uid, ids, context=context):
+            if(obj.opportunity_id.id):
+                newid = obj.opportunity_id.id
+                message = _("<b>scheduled for meeting</b> %s.") % (obj.date)
+                for lead in lead_obj.browse(cr, uid, [newid], context=context):
+                    lead.message_append_note('', message)
+
     def case_open(self, cr, uid, ids, *args):
         """Confirms meeting
         @param self: The object pointer
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 8d9a47b15eb..077bbeb6cbb 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -32,6 +32,7 @@ class crm_phonecall(crm_base, osv.osv):
     _name = "crm.phonecall"
     _description = "Phonecall"
     _order = "id desc"
+    _inherit = ['mail.thread']
     _columns = {
         # From crm.case
         'id': fields.integer('ID', readonly=True),
@@ -71,12 +72,16 @@ class crm_phonecall(crm_base, osv.osv):
                                  type="char", string="Contact", size=128),
         'partner_mobile': fields.char('Mobile', size=32),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
-        'date_closed': fields.datetime('Closed', readonly=True), 
-        'date': fields.datetime('Date'), 
-        'opportunity_id': fields.many2one ('crm.lead', 'Lead/Opportunity'), 
+        'date_closed': fields.datetime('Closed', readonly=True),
+        'date': fields.datetime('Date'),
+        'opportunity_id': fields.many2one ('crm.lead', 'Lead/Opportunity'),
         'message_ids': fields.one2many('mail.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
     }
 
+    def create(self, cr, uid, vals, context=None):
+        obj_id = super(crm_phonecall, self).create(cr, uid, vals, context=context)
+        return obj_id
+
     def _get_default_state(self, cr, uid, context=None):
         if context and context.get('default_state', False):
             return context.get('default_state')

From 1c2730f8fc695aebde19033d4a6a408e39ddeab0 Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Wed, 29 Feb 2012 11:38:01 +0530
Subject: [PATCH 08/10] [IMP] Remove dates from extra info tab and
 communication & history tab from opportuniy form.

bzr revid: bth@tinyerp.com-20120229060801-w767cwupujml06ut
---
 addons/crm/crm_lead.py       |  2 ++
 addons/crm/crm_lead_view.xml | 34 ++++------------------------------
 2 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index ef9eff16eac..31e5b9d049d 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -278,6 +278,8 @@ class crm_lead(crm_case, osv.osv):
                 message = _("Opportunity is <b>created</b>.")
             elif obj.type=="lead" :
                 message = _("Lead is <b>created</b>.")
+            else:
+                message = _("The case has been <b>created</b>.")
             self.message_append_note(cr, uid, ids, _('System notification'),
                         message, type='notification', need_action_user_id=obj.user_id.id, context=context)
         return True
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 699b11b9bfe..185f9f55ef8 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -434,6 +434,10 @@
                     <button name="action_makeMeeting" type="object"
                     string="Schedule Meeting" icon="gtk-redo" />
                     <newline/>
+                    <button string="Send New Email"
+                        name="%(mail.action_email_compose_message_wizard)d"
+                        icon="terp-mail-message-new" type="action"/>
+                    <newline/>
                     <field name="date_action"/>
                     <field name="title_action"/>
                     <field name="priority" string="Priority"/>
@@ -520,37 +524,7 @@
                         <field name="optout" on_change="on_change_optout(optout)"/>
                     </group>
                 </page>
-                <page string="Communication &amp; History" groups="base.group_extended">
-                    <group colspan="4">
-                      <field colspan="4" name="email_cc" widget="char" size="512"/>
-                    </group>
-                    <field name="message_ids" colspan="4" nolabel="1" mode="tree" readonly="1">
-                        <tree string="History">
-                            <field name="display_text" string="History Information"/>
-                            <field name="email_from" invisible="1"/>
-                            <button
-                                string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
-                                name="%(mail.action_email_compose_message_wizard)d"
-                                context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
-                                icon="terp-mail-replied" type="action" />
-                        </tree>
-                    </field>
-                    <button string="Add Internal Note"
-                        name="%(crm.action_crm_add_note)d"
-                        context="{'model': 'crm.lead' }"
-                        icon="terp-document-new" type="action" />
-                    <button string="Send New Email"
-                        name="%(mail.action_email_compose_message_wizard)d"
-                        icon="terp-mail-message-new" type="action"/>
-                </page>
                 <page string="Extra Info" groups="base.group_extended">
-                    <group col="2" colspan="2">
-                        <separator string="Dates" colspan="2"/>
-                        <field name="create_date"/>
-                        <field name="write_date"/>
-                        <field name="date_closed"/>
-                        <field name="date_open"/>
-                    </group>
                     <group col="2" colspan="2">
                         <separator string="Misc" colspan="2"/>
                         <field name="active"/>

From 23efc0893b3676e9cb82890f4ea81583657e562b Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Wed, 29 Feb 2012 12:32:40 +0530
Subject: [PATCH 09/10] [IMP] notification with need action in phonecall when
 schedule a call.

bzr revid: bth@tinyerp.com-20120229070240-dqhfox2oyp7but6t
---
 addons/crm/crm_lead.py      |  2 ++
 addons/crm/crm_phonecall.py | 24 ++++++++++++------------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 31e5b9d049d..18f746880ca 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -341,6 +341,8 @@ class crm_lead(crm_case, osv.osv):
             else :
                 message = _("<b>%s a call</b>.") % (action)
             case.message_append_note('', message)
+            if action == "schedule" :
+                phonecall.message_append_note(cr, uid, ids, '', message, need_action_user_id=obj.user_id.id)
 
     def case_open(self, cr, uid, ids, context=None):
         res = super(crm_lead, self).case_open(cr, uid, ids, context)
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 077bbeb6cbb..4063157aed9 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -50,12 +50,12 @@ class crm_phonecall(crm_base, osv.osv):
         'company_id': fields.many2one('res.company', 'Company'),
         'description': fields.text('Description'),
         'state': fields.selection([
-                                    ('draft', 'Draft'), 
-                                    ('open', 'Todo'), 
-                                    ('cancel', 'Cancelled'), 
-                                    ('done', 'Held'), 
+                                    ('draft', 'Draft'),
+                                    ('open', 'Todo'),
+                                    ('cancel', 'Cancelled'),
+                                    ('done', 'Held'),
                                     ('pending', 'Not Held'),
-                                ], 'State', size=16, readonly=True, 
+                                ], 'State', size=16, readonly=True,
                                   help='The state is set to \'Todo\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the call is over, the state is set to \'Held\'.\
@@ -89,8 +89,8 @@ class crm_phonecall(crm_base, osv.osv):
 
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
-        'priority': crm.AVAILABLE_PRIORITIES[2][0], 
-        'state':  _get_default_state, 
+        'priority': crm.AVAILABLE_PRIORITIES[2][0],
+        'state':  _get_default_state,
         'user_id': lambda self,cr,uid,ctx: uid,
         'active': 1,
     }
@@ -122,7 +122,7 @@ class crm_phonecall(crm_base, osv.osv):
     def case_reset(self, cr, uid, ids, *args):
         """Resets case as Todo
         """
-        res = super(crm_phonecall, self).case_reset(cr, uid, ids, args, 'crm.phonecall')
+        res = super(crm_phonecall, self).case_reset(cr, uid, ids, args)
         self.write(cr, uid, ids, {'duration': 0.0, 'state':'open'})
         return res
 
@@ -163,7 +163,7 @@ class crm_phonecall(crm_base, osv.osv):
                     'partner_mobile' : call.partner_mobile,
                     'priority': call.priority,
             }
-            
+
             new_id = self.create(cr, uid, vals, context=context)
             self.case_open(cr, uid, [new_id])
             if action == 'log':
@@ -248,13 +248,13 @@ class crm_phonecall(crm_base, osv.osv):
                             'planned_revenue': planned_revenue,
                             'probability': probability,
                             'partner_id': partner_id or False,
-                            'partner_address_id': default_contact and default_contact.id, 
+                            'partner_address_id': default_contact and default_contact.id,
                             'phone': default_contact and default_contact.phone,
                             'mobile': default_contact and default_contact.mobile,
                             'section_id': call.section_id and call.section_id.id or False,
                             'description': call.description or False,
                             'priority': call.priority,
-                            'type': 'opportunity', 
+                            'type': 'opportunity',
                             'phone': call.partner_phone or False,
                             'email_from': default_contact and default_contact.email,
                         })
@@ -266,7 +266,7 @@ class crm_phonecall(crm_base, osv.osv):
             self.case_close(cr, uid, [call.id])
             opportunity.case_open(cr, uid, [opportunity_id])
             opportunity_dict[call.id] = opportunity_id
-        return opportunity_dict   
+        return opportunity_dict
 
     def action_make_meeting(self, cr, uid, ids, context=None):
         """

From 4fd9980327c7e80c34ea25bced12313bfa1948d9 Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Wed, 29 Feb 2012 15:52:49 +0530
Subject: [PATCH 10/10] [IMP] Call notifications methods from crm base.

bzr revid: bth@tinyerp.com-20120229102249-xci8gnbic0npnovs
---
 addons/crm/crm.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 4c603777820..fdcd7a1a52a 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -289,6 +289,7 @@ class crm_base(object):
             if not case.user_id:
                 data['user_id'] = uid
             self.write(cr, uid, [case.id], data)
+            self._case_open_notification(case, context=context)
         self._action(cr, uid, cases, 'open')
 
         return True
@@ -301,6 +302,7 @@ class crm_base(object):
         cases[0].state # to fill the browse record cache
         self.write(cr, uid, ids, {'state': 'done', 'date_closed': time.strftime('%Y-%m-%d %H:%M:%S'), })
         # We use the cache of cases to keep the old case state
+        self._case_close_notification(cases, context=context)
         self._action(cr, uid, cases, 'done')
         return True
 
@@ -312,6 +314,7 @@ class crm_base(object):
         cases[0].state # to fill the browse record cache
         self.write(cr, uid, ids, {'state': 'cancel', 'active': True})
         # We use the cache of cases to keep the old case state
+        self._case_cancel_notification(cases, context=context)
         self._action(cr, uid, cases, 'cancel')
         return True
 
@@ -322,6 +325,7 @@ class crm_base(object):
         cases = self.browse(cr, uid, ids)
         cases[0].state # to fill the browse record cache
         self.write(cr, uid, ids, {'state': 'pending', 'active': True})
+        self._case_pending_notification(cases, context=context)
         self._action(cr, uid, cases, 'pending')
         return True