[FIX] website_sale: corrected a small error in template condition and a bit of cleaning
Merge branch 'master-website_sale-followup-dmo' of github.com:odoo-dev/odoo into master-website_sale-followup-dmo