8.0 'purchase' improve (onesteinbv)



Port 'purchase' modification realized by OneStein BV. (branch onesteinbv:8.0-os)

Please make these changes on a file `openupgrade_analysis_work.txt` or similar, because this will be overwritten in next analysis update.