Merge pull request #81 from const3/master

AfePlaza [#48662539]
Conflictos arreglados
Merge branch 'master' of git://github.com/jdmr/mateo
Criteria cobro a campo corregido [Fixes#47816775] terminado