[MERGE]sync with trunk
authorSanjay Gohel (OpenERP) <sgo@tinyerp.com>
Mon, 10 Feb 2014 05:26:55 +0000 (10:56 +0530)
committerSanjay Gohel (OpenERP) <sgo@tinyerp.com>
Mon, 10 Feb 2014 05:26:55 +0000 (10:56 +0530)
commit77581e2a063d79de5644ca5bd607d4509f92a613
treeece66af17f58ca94d87cb3b254d214a91e37a354
parenteb1a56cd91b9f36bed54c458e88cdb51ac913d97
parentd8c5a1c4c2a5f3a7f11c66fdbc624485e6485489
[MERGE]sync with trunk

bzr revid: sgo@tinyerp.com-20140210052655-efiwytz5kllk7irx
addons/account/account.py
addons/account/account_view.xml
addons/account_analytic_plans/account_analytic_plans_view.xml
addons/analytic/analytic.py
addons/project/project_data.xml