openerp-dev-web team mailing list archive

["Ujjvala Collins \(OpenERP\)" <uco@xxxxxxxxxxx>]

Ujjvala Collins (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/addons1-crm-imp-uco-merge-opportunity into lp:~openerp-dev/openobject-addons/addons1-crm-imp.

Requested reviews:
  OpenERP R&D Team (openerp-dev)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/addons1-crm-imp-uco-merge-opportunity/+merge/48751

[FIX]:crm: 
Fixed browse record attribute error when Merge opportunities wizard is called.

-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/addons1-crm-imp-uco-merge-opportunity/+merge/48751
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/addons1-crm-imp-uco-merge-opportunity into lp:~openerp-dev/openobject-addons/addons1-crm-imp.

=== modified file 'crm/wizard/crm_merge_opportunities.py'
--- crm/wizard/crm_merge_opportunities.py	2011-02-07 00:47:29 +0000
+++ crm/wizard/crm_merge_opportunities.py	2011-02-07 05:48:59 +0000
@@ -82,7 +82,7 @@
                 'contact_name' : self._concat_all('contact_name', op_ids), #not lost
                 'country_id' : self._get_first_not_null_id('country_id', op_ids), #!!
                 'partner_address_id' : self._get_first_not_null_id('partner_address_id', op_ids), #!!
-                'partner_assigned_id' : self._get_first_not_null_id('partner_assigned_id', op_ids), #!!
+                'partner_assigned_id' : hasattr(opp_obj,'partner_assigned_id') and self._get_first_not_null_id('partner_assigned_id', op_ids), #!!
                 'type_id' : self._get_first_not_null_id('type_id', op_ids), #!!
                 'user_id' : self._get_first_not_null_id('user_id', op_ids), #!!
                 'section_id' : self._get_first_not_null_id('section_id', op_ids), #!!
@@ -91,8 +91,8 @@
                 'email' : self._get_first_not_null('email', op_ids), # !!
                 'fax' : self._get_first_not_null('fax', op_ids),	
                 'mobile' : self._get_first_not_null('mobile', op_ids),	
-                'partner_latitude' : self._get_first_not_null('partner_latitude', op_ids),	
-                'partner_longitude' : self._get_first_not_null('partner_longitude', op_ids),	
+                'partner_latitude' : hasattr(opp_obj,'partner_latitude') and self._get_first_not_null('partner_latitude', op_ids),	
+                'partner_longitude' : hasattr(opp_obj,'partner_longitude') and self._get_first_not_null('partner_longitude', op_ids),	
                 'partner_name' : self._get_first_not_null('partner_name', op_ids),	
                 'phone' : self._get_first_not_null('phone', op_ids),	
                 'probability' : self._get_first_not_null('probability', op_ids),