Merge branch 'Desarrollo2'
Merge branch 'master' into desarrollo
validando descuento null
Merge branch 'desarrollo' of https://github.com/MarioASM/sysMqr into desarrollo