Extra settings in vouchers for flexible behaviour in complex cases.
Update oxpriceTest.php
Update oxprice.php
Merge branch 'master' into b-5.1-ce