Merge proposals dependent on lp:~hbee/openobject-addons/7.0-merge_purchase_requisitions_wkf_fix

1. 7.0-merge_purchase_requisitions_wkf_fix
2. Dependent merge proposals