Do not duplicate origin when merging purchase orders
[FIX] Do not duplicate origin when merging purchase orders
Merge branch 'master' of bzr::lp:ocb-addons/6.1 into ocb-6.1