[MERGE]:lp:~openerp-dev/openobject-addons/trunk-contract-apa-report-improvements-dbr