[Merge]Merge with openobject-server
authorVishmita Jadeja (openerp) <vja@tinyerp.com>
Wed, 15 May 2013 09:55:10 +0000 (15:25 +0530)
committerVishmita Jadeja (openerp) <vja@tinyerp.com>
Wed, 15 May 2013 09:55:10 +0000 (15:25 +0530)
commitfa9abf91f7043e37e66e3449c2ee847470a2a737
treea42404f654d45abeb9f19d624f8a8112e496fd23
parente992bb8af8b9b1540ed305837abd1a6b061b671e
parent2b7861f8c703c66ce14770a6fabf5c9900d72658
[Merge]Merge with openobject-server

bzr revid: vja@tinyerp.com-20130515095510-rrl5xeen0a1oxzvu
openerp/addons/base/res/res_company.py
openerp/addons/base/res/res_partner.py