Do not duplicate origin when merging purchase orders
[FIX] Do not duplicate origin when merging purchase orders
Merge branch 'ocb-addons/6.1' into demo-ocb/6.1