delivery report
Merge branch 'master' of github.com:jmesteve/openerp

Conflicts:
	openerp/addons_extra/delivery_extend/delivery_extend.py