[MERGE] merge with lp:openobject-addons
authorAjay Chauhan (OpenERP) <cha@tinyerp.com>
Fri, 2 Nov 2012 10:18:38 +0000 (15:48 +0530)
committerAjay Chauhan (OpenERP) <cha@tinyerp.com>
Fri, 2 Nov 2012 10:18:38 +0000 (15:48 +0530)
commit23020e0551f4fe7e46b78dfa83daaff93696755b
tree5c5c81538465ad18b997e112d8e0bfc631e2c2c9
parentd206baaf0ff45e7316749869337e27853acbd63a
parentbb2e63e67fd4980868dfed15736932909a3a03a9
[MERGE] merge with lp:openobject-addons

bzr revid: cha@tinyerp.com-20121102101838-k560rdxps9o3akob
addons/account/project/project_view.xml
addons/account_budget/account_budget_view.xml
addons/analytic/analytic.py