diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java
index d20967620..0d46c2a21 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java
@@ -1403,35 +1403,37 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
 		sb.append(" 		imp.numeroidentificacao as numeroidentificacao,");
 		sb.append(" 		(CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END) as estadoorigem,");
 		sb.append(" 		(");
-		sb.append(" 			select nvl(sum(r5i.imptotalliquido), 0)");
-		sb.append(" 			from fiscal_r5 r5i");
-		sb.append(" 			join fiscal_r4 r4i on r4i.numserie20 = r5i.numserie20 and r4i.datamov = r5i.datamov and r4i.coo = r5i.coo and r4i.contador = r5i.contador");
+		sb.append(" 			select sum(coalesce(to_number(r5i.imptotalliquido)/100,ci.preciopagado))");
+		sb.append(" 			from fiscal_r4 r4i");
 		sb.append(" 			join boleto bi on bi.boleto_id = r4i.boleto_id");
 		sb.append(" 			join parada poi on poi.parada_id = bi.origen_id");
 		sb.append(" 			join parada pdi on pdi.parada_id = bi.destino_id");
+		sb.append(" 			left join fiscal_r5 r5i on r5i.numserie20 = r4i.numserie20 and r5i.datamov = r4i.datamov and r5i.coo = r4i.coo and r5i.contador = r4i.contador and r5i.totparcial not like 'N1'");
 		sb.append(" 			left join alias_servico si on si.origen_id = bi.origen_id and si.destino_id = bi.destino_id and (si.corrida_id = bi.corrida_id or si.corrida_id is null) and si.ruta_id = bi.ruta_id");
 		sb.append(" 			left join parada posi on posi.parada_id = si.aliasorigen_id");
 		sb.append(" 			left join parada pdsi on pdsi.parada_id = si.aliasdestino_id");
-		sb.append(" 			where r5i.numserie20 = r4.numserie20 and r5i.datamov = r2.datamov and r5i.totparcial not like 'N1'");
-		sb.append(" 				  and (nvl(case when si.aliasorigen_id is null then poi.regionmetropolitana_id else posi.regionmetropolitana_id end, -1) = nvl(case when si.aliasorigen_id is null then pdi.regionmetropolitana_id else pdsi.regionmetropolitana_id end, -2))");
+		sb.append(" 			left join caja ci on ci.caja_id = r4i.caja_id");
+		sb.append(" 			where r4i.numserie20 = r4.numserie20 and r4i.datamov = r2.datamov");
+		sb.append(" 			and (nvl(case when si.aliasorigen_id is null then poi.regionmetropolitana_id else posi.regionmetropolitana_id end, -1) = nvl(case when si.aliasorigen_id is null then pdi.regionmetropolitana_id else pdsi.regionmetropolitana_id end, -2))");
 		sb.append(" 		) as totalisenta,");
 		sb.append(" 		to_number(r2.vendabrutadiaria)/100 as vendabrutadiaria,");
 		sb.append(" 		to_number(r2.totgeral)/100 as totgeral,");
 		sb.append(" 		(");
-		sb.append(" 			select coalesce(sum(r5i.imptotalliquido),0)");
-		sb.append(" 			from fiscal_r5 r5i");
-		sb.append(" 			join fiscal_r4 r4i on r4i.numserie20 = r5i.numserie20 and r4i.datamov = r5i.datamov and r4i.coo = r5i.coo and r4i.contador = r5i.contador");
+		sb.append(" 			select sum(coalesce(to_number(r5i.imptotalliquido)/100,ci.preciopagado))");
+		sb.append(" 			from fiscal_r4 r4i");
 		sb.append(" 			join boleto bi on bi.boleto_id = r4i.boleto_id");
 		sb.append(" 			join parada poi on poi.parada_id = bi.origen_id");
 		sb.append(" 			join ciudad coi on coi.ciudad_id = poi.ciudad_id");
 		sb.append(" 			join estado eoi on eoi.estado_id = coi.estado_id");
+		sb.append(" 			left join fiscal_r5 r5i on r5i.numserie20 = r4i.numserie20 and r5i.datamov = r4i.datamov and r5i.coo = r4i.coo and r5i.contador = r4i.contador and r5i.totparcial not like 'N1'");
 		sb.append(" 			left join alias_servico si on si.origen_id = bi.origen_id and si.destino_id = bi.destino_id and (si.corrida_id = bi.corrida_id or si.corrida_id is null) and si.ruta_id = bi.ruta_id");
 		sb.append(" 			left join parada posi on posi.parada_id = si.aliasorigen_id");
 		sb.append(" 			left join ciudad cosi on cosi.ciudad_id = posi.ciudad_id");
 		sb.append(" 			left join estado eosi on eosi.estado_id = cosi.estado_id");
-		sb.append(" 			where r5i.numserie20 = r2.numserie20 and r5i.datamov = r2.datamov and r5i.totparcial not like 'N1'");
+		sb.append(" 			left join caja ci on ci.caja_id = r4i.caja_id");
+		sb.append(" 			where r4i.numserie20 = r2.numserie20 and r4i.datamov = r2.datamov");
 		sb.append(" 			and ((CASE WHEN si.aliasorigen_id IS NULL THEN eoi.cveestado ELSE eosi.cveestado END) = (CASE WHEN s.aliasorigen_id IS NULL THEN eo.cveestado ELSE eos.cveestado END))");
-		sb.append(" 		)/100 as totalvenda,");
+		sb.append(" 		) as totalvenda,");
 		sb.append(" 		0 as caja_id");
 		sb.append(" 	from fiscal_r4 r4");
 		sb.append(" 	join fiscal_r2 r2 on r2.numserie20 = r4.numserie20 and r2.datamov = r4.datamov");
@@ -1804,10 +1806,12 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
 		sb.append(" 	  (CASE WHEN s.aliasorigen_id IS NULL THEN ei.tributacaoimportacao ELSE eis.tributacaoimportacao END) as tributacao_importacao,");
 		sb.append(" 	  (CASE WHEN (nvl((CASE WHEN s.aliasorigen_id IS NULL THEN po.regionmetropolitana_id ELSE pos.regionmetropolitana_id END),-1) = nvl((CASE WHEN s.aliasdestino_id IS NULL THEN pd.regionmetropolitana_id ELSE pds.regionmetropolitana_id END),-2)) THEN 1 ELSE 0 END) as isenta,");
 		sb.append(" 	  (");
-		sb.append(" 			select coalesce(sum(r5i.imptotalliquido),0)");
-		sb.append(" 			from fiscal_r5 r5i");
-		sb.append(" 			where r5i.numserie20 = r4.numserie20 and r5i.datamov = r4.datamov and r5i.coo = r4.coo and r5i.totparcial not like 'N1'");
-		sb.append(" 	  )/100 as valortotal");
+		sb.append(" 			select sum(coalesce(to_number(r5i.imptotalliquido)/100,ci.preciopagado))");
+		sb.append(" 			from fiscal_r4 r4i");
+		sb.append(" 			left join fiscal_r5 r5i on r5i.numserie20 = r4i.numserie20 and r5i.datamov = r4i.datamov and r5i.coo = r4i.coo and r5i.totparcial not like 'N1'");
+		sb.append(" 			left join caja ci on ci.caja_id = r4i.caja_id");
+		sb.append(" 			where r4i.numserie20 = r4.numserie20 and r4i.datamov = r4.datamov and r4i.coo = r4.coo");
+		sb.append(" 	  ) as valortotal");
 		sb.append(" 	from fiscal_r4 r4");
 		sb.append(" 	join fiscal_r2 r2 on r2.numserie20 = r4.numserie20 and r2.datamov = r4.datamov");
 		sb.append(" 	join boleto b on b.boleto_id = r4.boleto_id");
@@ -2050,10 +2054,12 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
 		sb.append(" 	  (CASE WHEN s.aliasorigen_id IS NULL THEN ei.porcredestadual ELSE eis.porcredestadual END) as porc_red_estadual,");
 		sb.append(" 	  (CASE WHEN s.aliasorigen_id IS NULL THEN ei.tributacaoimportacao ELSE eis.tributacaoimportacao END) as tributacao_importacao,");
 		sb.append(" 	  (");
-		sb.append(" 			select coalesce(sum(r5i.imptotalliquido),0)");
-		sb.append(" 			from fiscal_r5 r5i");
-		sb.append(" 			where r5i.numserie20 = r4.numserie20 and r5i.datamov = r4.datamov and r5i.coo = r4.coo and r5i.totparcial not like 'N1'");
-		sb.append(" 	  )/100 as valortotal,");
+		sb.append(" 			select sum(coalesce(to_number(r5i.imptotalliquido)/100,ci.preciopagado))");
+		sb.append(" 			from fiscal_r4 r4i");
+		sb.append(" 			left join fiscal_r5 r5i on r5i.numserie20 = r4i.numserie20 and r5i.datamov = r4i.datamov and r5i.coo = r4i.coo and r5i.totparcial not like 'N1'");
+		sb.append(" 			left join caja ci on ci.caja_id = r4i.caja_id");
+		sb.append(" 			where r4i.numserie20 = r4.numserie20 and r4i.datamov = r4.datamov and r4i.coo = r4.coo");
+		sb.append(" 	  ) as valortotal,");
 		sb.append(" 	  0 as caja_id");
 		sb.append(" 	from fiscal_r4 r4");
 		sb.append(" 	join fiscal_r2 r2 on r2.numserie20 = r4.numserie20 and r2.datamov = r4.datamov");