Merge proposals dependent on lp:~camptocamp/openerp-humanitarian-ngo/purchase-wkfl-fix-domain-nbi

1. purchase-wkfl-fix-domain-nbi
2. Dependent merge proposals