[FIX] website_sale: discount price is never hide
merge from 8.0
Merge pull request #1001 from odoo-dev/master-fix-website_sale-double-price-chm

[FIX] website_sale: discount price is never hide
Merge branch '8.0' of https://github.com/odoo/odoo into 8.0-linux64