Product edit to include ability to assign product to existing discount

Being able to assign a product to an existing discount when editing the product itself or when adding a new product rather than having to edit the discount as is now required