Merge branch 'desarrollo'
Merge branch 'desarrollo'
actualizando de la ultima version
Add discounts area

owncodes add methods, controller, views and models for Discounts area
Merge branch 'desarrollo'
Merge branch 'master' of https://github.com/MarioASM/sysMqr