Update to product and voucher checking