8.0 'purchase' improve (onesteinbv)

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

Done.