reporte de facturación terminado
Merge remote-tracking branch 'origin/Sprint5' into ReporteFacturacion

Conflicts:
	rom/grails-app/controllers/rom/PedidoController.groovy
	rom/grails-app/views/reporte/reporteFacturacion.gsp
Merge remote-tracking branch 'origin/Sprint5' into ReporteFacturacion

Conflicts:
	rom/grails-app/controllers/rom/ReporteController.groovy
Merge remote-tracking branch 'origin/ReporteFacturacion' into Sprint5

Conflicts:
	rom/grails-app/controllers/rom/ReporteController.groovy
	rom/grails-app/views/reporte/reporteProductos.gsp