[MERGE]: Merge with lp:~openerp-dev/openobject-addons/ksa-addons2