Conflictos arreglados
Merge branch 'master' of git://github.com/jdmr/mateo
Criteria cobro a campo corregido [Fixes#47816775] terminado
Criteria cobro a campo corregido [Fixes#47816775] terminado
Merge branch 'master' of git://github.com/jdmr/mateo
Merge pull request #83 from const3/master

Cobro a Campo funcionando [#47816775]