Discounts in sales without test
test for discounts
Do adjust in method total, 
improve views
fix merge
change name of migration because we have 2 migrations with same name
Merge pull request #11 from suyccom/issue_10437_descuentos_pantalla_de_ventas

issue 10437 discounts