Merge proposals dependent on lp://staging/~acsone-openerp/openobject-server/6.1-fixes

lp://staging/~acsone-openerp/openobject-server/6.1-fixes has no merge proposals.