Merged Latest.

bzr revid: tta@openerp.com-20130501063402-qaecsju4nhxn0iy8

diff --cc openerp/addons/base/res/res_company.py
index c8ea8d7,c8ea8d7..cd17f6d
--- 1/openerp/addons/base/res/res_company.py
--- 2/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@@ -253,7 -253,7 +253,7 @@@ class res_company(osv.osv)
          vals.update({'partner_id': partner_id})
          self.cache_restart(cr)
          company_id = super(res_company, self).create(cr, uid, vals, context=context)
--        obj_partner.write(cr, uid, partner_id, {'company_id': company_id}, context=context)
++        obj_partner.write(cr, uid, [partner_id], {'company_id': company_id}, context=context)
          return company_id
  
      def write(self, cr, uid, ids, values, context=None):

diff --cc openerp/addons/base/res/res_partner.py
index c46fd71,404fe56..6948a35
--- 1/openerp/addons/base/res/res_partner.py
--- 2/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@@ -442,7 -446,7 +446,7 @@@ class res_partner(osv.osv, format_addre
              commercial_fields = self._commercial_fields(cr, uid, context=context)
              sync_vals = self._update_fields_values(cr, uid, partner.commercial_partner_id,
                                                          commercial_fields, context=context)
--            return self.write(cr, uid, partner.id, sync_vals, context=context)
++            partner.write(sync_vals)
  
      def _commercial_sync_to_children(self, cr, uid, partner, context=None):
          """ Handle sync of commercial fields to descendants """
@@@ -468,7 -472,7 +472,7 @@@
                                                        use_parent_address=partner.use_parent_address,
                                                        parent_id=partner.parent_id.id,
                                                        context=context).get('value', {})
--                self.update_address(cr, uid, partner.id, onchange_vals, context=context)
++                partner.update_address(onchange_vals)
  
          # 2. To DOWNSTREAM: sync children 
          if partner.child_ids: