From 535205d8363117d504af6daf135afe3390f7167a Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Mon, 1 Nov 2010 12:56:01 +0530
Subject: [PATCH 1/3] [FIX] crm_claim: Fixed attribute error.

bzr revid: uco@tinyerp.com-20101101072601-y1y7vyx11cvykwrx
---
 addons/crm_claim/crm_claim_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 8175dd20da6..e2107f44501 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -111,7 +111,6 @@
                                     <field name="section_id" widget="selection"/>
                                     <group colspan="2" col="4">
                                         <field name="stage_id"
-                                            on_change="onchange_stage_id(stage_id)"
                                             domain="[('object_id.model', '=', 'crm.claim'), ('section_ids', '=', section_id)]" />
                                         <button name="stage_previous" string="" type="object" icon="gtk-go-back" />
                                         <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>

From 37be99175110908f4d51cc0852ef24e3962c0756 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Mon, 1 Nov 2010 15:16:17 +0530
Subject: [PATCH 2/3] [IMP] crm: Historize changes on Stage for Leads and
 Opportunities.

bzr revid: uco@tinyerp.com-20101101094617-oujei764tfi1hpo5
---
 addons/crm/crm_lead.py              | 10 +++++++++-
 addons/crm/crm_lead_view.xml        |  3 ++-
 addons/crm/crm_opportunity.py       |  9 ++++++++-
 addons/mail_gateway/mail_gateway.py |  2 ++
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 6a113a42c2a..acc2eb8dbec 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -286,11 +286,19 @@ class crm_lead(crm_case, osv.osv):
         stage = super(crm_lead, self).stage_next(cr, uid, ids, context)
         if stage:
             stage_obj = self.pool.get('crm.case.stage').browse(cr, uid, stage, context=context)
+            self.onchange_stage_id(cr, uid, ids, stage)
             if stage_obj.on_change:
                 data = {'probability': stage_obj.probability}
                 self.write(cr, uid, ids, data)
         return stage
-
+    
+    def stage_previous(self, cr, uid, ids, context=None):
+        stage = super(crm_lead, self).stage_previous(cr, uid, ids, context)
+        if stage:
+            for case in self.browse(cr, uid, ids):
+                self.onchange_stage_id(cr, uid, [case.id], case.stage_id.id)
+        return stage
+    
     def message_new(self, cr, uid, msg, context):
         """
         Automatically calls when new email message arrives
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 1b1e7ec04e9..b20e1df5d89 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -57,7 +57,8 @@
                     <newline />
                     <field name="section_id" widget="selection" />
                     <field name="user_id" />
-                    <field name="stage_id" domain="[('object_id.model', '=', 'crm.lead'), ('section_ids', '=', section_id)]"/>
+                    <field name="stage_id" domain="[('object_id.model', '=', 'crm.lead'), ('section_ids', '=', section_id)]" 
+                           on_change="onchange_stage_id(stage_id)"/>
                     <group col="2" colspan="1">
                         <button name="stage_previous" string=""
                             states="open,pending,draft" type="object"
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 9bd998d0f46..978b1849452 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -142,11 +142,18 @@ class crm_opportunity(osv.osv):
             @param uid: the current user’s ID for security checks,
             @param ids: List of stage’s IDs
             @stage_id: change state id on run time """
-
         if not stage_id:
             return {'value':{}}
 
         stage = self.pool.get('crm.case.stage').browse(cr, uid, stage_id, context)
+        self.history(cr, uid, ids, _('Stage'), details=stage.name)
+        for case in self.browse(cr, uid, ids):
+            if case.type == 'lead':
+                message = _("The stage of lead '%s' has been changed to '%s'.") % (case.name, case.stage_id.name)
+            elif case.type == 'opportunity':
+                message = _("The stage of opportunity '%s' has been changed to '%s'.") % (case.name, case.stage_id.name)
+            self.log(cr, uid, case.id, message)
+
         if not stage.on_change:
             return {'value':{}}
         return {'value':{'probability': stage.probability}}
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index a116a18b56d..696c7571cfb 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -250,6 +250,8 @@ class mailgate_message(osv.osv):
                 elif message.name == _('Note'):
                     msg_txt = (message.user_id.name or '/') + _(' added note on ') + format_date_tz(message.date, tz) + ':\n\t'
                     msg_txt += self.truncate_data(cr, uid, message.description, context=context)
+                elif message.name == _('Stage'):
+                    msg_txt += _("Changed Stage to: ") + message.description
                 else:
                     msg_txt += _("Changed Status to: ") + message.name
             result[message.id] = msg_txt

From e1ddb581a3c42f218cc1591d3e277899216888eb Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Mon, 1 Nov 2010 18:00:59 +0530
Subject: [PATCH 3/3] [REF] crm: Reverted the changes of on change method.
 Historize only when 'Next' and 'Previous' buttons are clicked.

bzr revid: uco@tinyerp.com-20101101123059-7z0kpnrz5rkvzon1
---
 addons/crm/crm.py             |  2 +-
 addons/crm/crm_lead.py        | 16 ++++++++++++++--
 addons/crm/crm_lead_view.xml  |  3 +--
 addons/crm/crm_opportunity.py |  7 -------
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index c809857de66..d54f82af52c 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -201,7 +201,7 @@ class crm_case(object):
                 if stage.on_change:
                     data.update({'probability': stage.probability})
             self.write(cr, uid, [case.id], data, context=context)
-        return True
+        return prev_stage
 
     def onchange_partner_id(self, cr, uid, ids, part, email=False):
         """This function returns value of partner address based on partner
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index acc2eb8dbec..68dac281c82 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -286,7 +286,13 @@ class crm_lead(crm_case, osv.osv):
         stage = super(crm_lead, self).stage_next(cr, uid, ids, context)
         if stage:
             stage_obj = self.pool.get('crm.case.stage').browse(cr, uid, stage, context=context)
-            self.onchange_stage_id(cr, uid, ids, stage)
+            self.history(cr, uid, ids, _('Stage'), details=stage_obj.name)
+            for case in self.browse(cr, uid, ids):
+                if case.type == 'lead':
+                    message = _("The stage of lead '%s' has been changed to '%s'.") % (case.name, case.stage_id.name)
+                elif case.type == 'opportunity':
+                    message = _("The stage of opportunity '%s' has been changed to '%s'.") % (case.name, case.stage_id.name)
+                self.log(cr, uid, case.id, message)
             if stage_obj.on_change:
                 data = {'probability': stage_obj.probability}
                 self.write(cr, uid, ids, data)
@@ -295,8 +301,14 @@ class crm_lead(crm_case, osv.osv):
     def stage_previous(self, cr, uid, ids, context=None):
         stage = super(crm_lead, self).stage_previous(cr, uid, ids, context)
         if stage:
+            stage_obj = self.pool.get('crm.case.stage').browse(cr, uid, stage, context=context)
+            self.history(cr, uid, ids, _('Stage'), details=stage_obj.name)
             for case in self.browse(cr, uid, ids):
-                self.onchange_stage_id(cr, uid, [case.id], case.stage_id.id)
+                if case.type == 'lead':
+                    message = _("The stage of lead '%s' has been changed to '%s'.") % (case.name, case.stage_id.name)
+                elif case.type == 'opportunity':
+                    message = _("The stage of opportunity '%s' has been changed to '%s'.") % (case.name, case.stage_id.name)
+                self.log(cr, uid, case.id, message)
         return stage
     
     def message_new(self, cr, uid, msg, context):
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index d54cb363509..dff880c7fce 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -57,8 +57,7 @@
                     <newline />
                     <field name="section_id" widget="selection" />
                     <field name="user_id" />
-                    <field name="stage_id" domain="[('object_id.model', '=', 'crm.lead'), ('section_ids', '=', section_id)]" 
-                           on_change="onchange_stage_id(stage_id)"/>
+                    <field name="stage_id" domain="[('object_id.model', '=', 'crm.lead'), ('section_ids', '=', section_id)]"/>
                     <group col="2" colspan="1">
                         <button name="stage_previous" string=""
                             states="open,pending,draft" type="object"
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 978b1849452..a09d7b39e4c 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -146,13 +146,6 @@ class crm_opportunity(osv.osv):
             return {'value':{}}
 
         stage = self.pool.get('crm.case.stage').browse(cr, uid, stage_id, context)
-        self.history(cr, uid, ids, _('Stage'), details=stage.name)
-        for case in self.browse(cr, uid, ids):
-            if case.type == 'lead':
-                message = _("The stage of lead '%s' has been changed to '%s'.") % (case.name, case.stage_id.name)
-            elif case.type == 'opportunity':
-                message = _("The stage of opportunity '%s' has been changed to '%s'.") % (case.name, case.stage_id.name)
-            self.log(cr, uid, case.id, message)
 
         if not stage.on_change:
             return {'value':{}}