[Merge]: lp:~openerp-dev/openobject-addons/trunk-bugfixes-Ind.