[MRG] merge lp:~openerp-dev/openobject-addons/trunk-10click-warehouse-tpa-fix-aja