[MERGE]:merged from trunk
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 8 Jun 2012 05:05:06 +0000 (10:35 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 8 Jun 2012 05:05:06 +0000 (10:35 +0530)
commit226289a78a8657107c44e99dcdefb4065cb9cecb
treecaeb9f318a1e249a9af366330abbb28a9283a571
parent78b63279ecb1ba838de00a7438716392b7d623de
parenteaf472e20c631efd30bc3cca0ddffe5b0c41b6a8
[MERGE]:merged from trunk

bzr revid: qdp-launchpad@openerp.com-20120607135708-735m0d5mnp4mgj19
bzr revid: apa@tinyerp.com-20120607182134-pbjc2sbtstrpj0rf
bzr revid: apa@tinyerp.com-20120608050506-qzm3vxyk0j3i1j95
addons/account_analytic_analysis/report/analytic_account.py
addons/project/project_view.xml