[Merge]: Merge from lp:~openerp-dev/openobject-server/report_server.