supplier sub-orders fixing
Fixes merge conflicts
Merge branch 'sub-orders'