[MERGE] Merge with lp:openobject-addons

bzr revid: sbh@tinyerp.com-20110413045550-zlcq9sjo6txa65nz

diff --cc addons/crm/crm_lead.py
Simple merge

diff --cc addons/crm/wizard/crm_lead_to_partner.py
Simple merge

diff --cc addons/crm/wizard/crm_merge_opportunities.py
index 8eef972,8cf1d14..ba8603b
--- 1/addons/crm/wizard/crm_merge_opportunities.py
--- 2/addons/crm/wizard/crm_merge_opportunities.py
+++ b/addons/crm/wizard/crm_merge_opportunities.py
@@@ -1,4 -1,4 +1,3 @@@
--# -*- coding: utf-8 -*-
  ##############################################################################
  #
  #    OpenERP, Open Source Management Solution
@@@ -115,7 -139,7 +137,8 @@@ class crm_merge_opportunity(osv.osv_mem
              attach_ids = self.get_attachments(cr, uid, opp, context=context)
              self.set_attachements_res_id(cr, uid, first_opportunity.id, attach_ids)
              for history in opp.message_ids:
-                 message_obj.copy(cr, uid, history.id, default={'res_id': opp.id})
++
+                 new_history = message_obj.write(cr, uid, history.id, {'res_id': first_opportunity.id, 'name' : _("From %s : %s") % (opp.name, history.name) }, context=context)
  
          #Notification about loss of information
          details = []

diff --cc addons/crm_partner_assign/wizard/crm_forward_to_partner.py
Simple merge