[MERGE]sync with trunk
authorsgo@tinyerp.com <>
Mon, 22 Jul 2013 06:45:46 +0000 (12:15 +0530)
committersgo@tinyerp.com <>
Mon, 22 Jul 2013 06:45:46 +0000 (12:15 +0530)
commita241bec4bfdf19d13ab739dc2a591715782852b3
tree7036e3b7518a67b6657b04b3ceb507affc7c2bea
parentdf57e35cf7d9c9e71a31b5d3e33816c036bff670
parent1d82442202c9a632ef67b10e12d75c2ed9861a00
[MERGE]sync with trunk

bzr revid: sgo@tinyerp.com-20130722064546-5algtla91hpnaanb
addons/account/account.py
addons/account_analytic_plans/account_analytic_plans_view.xml
addons/project/project_data.xml