[MERGE]:merged from lp:~openerp-report/openobject-addons/report-dev