From b6f7d8b15daffaa25a0110d12779e227092b7e3a Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 26 Sep 2012 14:44:43 +0200
Subject: [PATCH] [IMP] rephrase a few comments, remove some useless
 whitespaces

bzr revid: abo@openerp.com-20120926124443-x4kufirera7jm4ul
---
 addons/crm/crm_lead.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index f533ea39d62..23aee5629db 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -294,7 +294,7 @@ class crm_lead(base_stage, format_address, osv.osv):
         if partner_id:
             partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
             values = {
-                'partner_name' : partner.name, 
+                'partner_name' : partner.name,
                 'street' : partner.street,
                 'street2' : partner.street2,
                 'city' : partner.city,
@@ -477,7 +477,7 @@ class crm_lead(base_stage, format_address, osv.osv):
     def _merge_notification(self, cr, uid, opportunity_id, opportunities, context=None):
         #TOFIX: mail template should be used instead of fix body, subject text
         details = []
-        merge_message = _('Merged opportunities ')
+        merge_message = _('Merged opportunities')
         subject = [merge_message]
         fields = ['name', 'partner_id', 'stage_id', 'section_id', 'user_id', 'categ_ids', 'channel_id', 'company_id', 'contact_name',
                   'email_from', 'phone', 'fax', 'mobile', 'state_id', 'description', 'probability', 'planned_revenue',
@@ -556,19 +556,18 @@ class crm_lead(base_stage, format_address, osv.osv):
 
         data = self._merge_data(cr, uid, ids, oldest, fields, context=context)
 
-
-        #copy message and attachements into the first opportunity
+        # Merge messages and attachements into the first opportunity
         self._merge_opportunity_history(cr, uid, first_opportunity.id, tail_opportunities, context=context)
         self._merge_opportunity_attachments(cr, uid, first_opportunity.id, tail_opportunities, context=context)
 
-        #Notification about loss of information
+        # Merge notifications about loss of information
         self._merge_notification(cr, uid, first_opportunity, opportunities, context=context)
-        # merge data into first opportunity
+        # Write merged data into first opportunity
         self.write(cr, uid, [first_opportunity.id], data, context=context)
-        #delete tail opportunities
+        # Delete tail opportunities
         self.unlink(cr, uid, [x.id for x in tail_opportunities], context=context)
 
-        #open first opportunity
+        # Open first opportunity
         self.case_open(cr, uid, [first_opportunity.id])
         return first_opportunity.id