[MERGE]sync with trunk
authorsgo@tinyerp.com <>
Mon, 29 Apr 2013 09:47:24 +0000 (15:17 +0530)
committersgo@tinyerp.com <>
Mon, 29 Apr 2013 09:47:24 +0000 (15:17 +0530)
commit98074af25893fd8004a3473ddf19b97cca2d1292
treeb944bff9295ed260b3ad60903c199893ca3c8f81
parentd5b39416c289755f558838536cacfda0435830ef
parent46b06bedf776dcb2d88f9c0fa6482c2c516d72b2
[MERGE]sync with trunk

bzr revid: sgo@tinyerp.com-20130329045549-b1028zj0gt6kke4y
bzr revid: sgo@tinyerp.com-20130401063611-gk310kzdbuwapfcq
bzr revid: sgo@tinyerp.com-20130417060721-05c26lhhr0oeju4m
bzr revid: sgo@tinyerp.com-20130423052852-823qrv1juo5iknm9
bzr revid: sgo@tinyerp.com-20130429094724-tq98e01wbdb3cwot
openerp/addons/base/res/res_company.py
openerp/addons/base/res/res_partner.py
openerp/tools/yaml_import.py