7.0 fix lp1192115 595240 opw skh

This is a port for the fix of lp:1192115  proposed  by the openerp support team