Merged Latest.
authorTejas Tank <tta@openerp.com>
Wed, 1 May 2013 06:34:02 +0000 (12:04 +0530)
committerTejas Tank <tta@openerp.com>
Wed, 1 May 2013 06:34:02 +0000 (12:04 +0530)
commite9104c75afa2ccf0b109c6496b5cfd8c3e44a984
treeb4e36d6b518ba9970f2ad6a581718a2501777ba3
parent8856845b7637deeaaa5ce20117aae050e533e653
parenta7323c16ec24ae6bc41034f7e93921e2cd8b2d7c
Merged Latest.

bzr revid: tta@openerp.com-20130501063402-qaecsju4nhxn0iy8
openerp/addons/base/res/res_company.py
openerp/addons/base/res/res_partner.py