From 598ffe543f523ecd4772cc313200490fea336ec6 Mon Sep 17 00:00:00 2001 From: wilian Date: Mon, 18 Apr 2016 18:10:55 +0000 Subject: [PATCH] fixes bug #6817 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@55033 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioAnaliticoVoucher.java | 3 + .../RelatorioAnaliticoVoucher.jasper | Bin 43700 -> 45614 bytes .../templates/RelatorioAnaliticoVoucher.jrxml | 58 +++++++++++++----- .../BusquedaImportacionFiscalController.java | 4 +- 4 files changed, 49 insertions(+), 16 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucher.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucher.java index 693c78400..d2dcdf9bf 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucher.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucher.java @@ -70,6 +70,7 @@ public class RelatorioAnaliticoVoucher extends Relatorio { sql.append(" case when b.motivocancelacion_id in (31, 32) then b.preciopagado * -1 else b.preciopagado end as tarifa, "); sql.append(" case when b.motivocancelacion_id in (31, 32) then b.importepedagio * -1 else b.importepedagio end as pedagio, "); sql.append(" case when b.motivocancelacion_id in (31, 32) then b.importetaxaembarque * -1 else b.importetaxaembarque end as embarque, "); + sql.append(" case when b.motivocancelacion_id in (31, 32) then b.importeseguro * -1 else b.importeseguro end as seguro, "); sql.append(" case when mc.descmotivo is null then 'VOUCHER' else mc.descmotivo end as status "); sql.append(" from boleto b "); sql.append(" join empresa e on b.marca_id = e.empresa_id "); @@ -104,6 +105,7 @@ public class RelatorioAnaliticoVoucher extends Relatorio { item.setTarifa(rset.getBigDecimal("tarifa")); item.setPedagio(rset.getBigDecimal("pedagio")); item.setEmbarque(rset.getBigDecimal("embarque")); + item.setSeguro(rset.getBigDecimal("seguro")); item.setStatus(rset.getString("status")); TotalRelatorioVoucher total = null; @@ -117,6 +119,7 @@ public class RelatorioAnaliticoVoucher extends Relatorio { total.setTarifa(total.getTarifa().add(item.getTarifa().intValue() < 0 ? item.getTarifa().multiply(new BigDecimal(-1)) : item.getTarifa())); total.setPedagio(total.getPedagio().add(item.getPedagio().intValue() < 0 ? item.getPedagio().multiply(new BigDecimal(-1)) : item.getPedagio())); total.setEmbarque(total.getEmbarque().add(item.getEmbarque().intValue() < 0 ? item.getEmbarque().multiply(new BigDecimal(-1)) : item.getEmbarque())); + total.setSeguro(total.getSeguro().add(item.getSeguro().intValue() < 0 ? item.getSeguro().multiply(new BigDecimal(-1)) : item.getSeguro())); totais.put(item.getStatus(), total); list.add(item); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAnaliticoVoucher.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAnaliticoVoucher.jasper index 3710343c93b7ff4b9e3d6a02125c45291ca1ca52..16ec8f5c64c9a4661a54cdc8bf032952e56c9f44 100644 GIT binary patch literal 45614 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ÚHkkKgFSx%dp-htJ_dXK4)%OT*9!|aViw&ga$uJE=zamSM+~7K zis5im<{$)=w17P)gFS6v zPY~=0fjy^yJzZc=80?9HJu$GS7wkC$?0Eq-7uHj64?L3DWkeIMv)zy4Q21;5c0c}4 z^g6mcXy}Av6}*?v&9z+L)BR=dPLBRZ-23M00B7K*bmc=$vG#hA(?j<1;h7!fbgs)G z@r+_Q|9=BlrpuG-wVeUFOYt24&+&DRQtn4~%)2-2{HM7+_0E0hN~;(3M-~22?NNn)RC`q6AJraJ_(!!z75-7}QH6h0dsN{c)gD#&N3};4{!#5w zg@06gRN)`h9#uFg#wgz^{G(&l8T_NLW!X~-|L8b%2LI^6>J0u-bTgT{mOZNStj&)O zr#xH7zEyeF&c0Q7b_)AeQx^-kAm9{;(hSNx*HT9{RGm%O`UE{ zeDqU1tD6!Zy(F;jj=le>kA80Wmw&<1B3GgK=$A;w@GrmmMf}UJLGBa$%daQ-mw%h! zU;bT^fBCI{mVfyjZ~yWE$G==m@8zPu^?oM)W>NFvQe$ z!zVlI#g`%<&dj{%Ezc(X#H zolX&3X@j^Bp067*wq>y;t^`C3)*}OZk*TM2rk;j#6hm!@dDe&tBIY?GW<6qFFk(W8 z`LPkR0WmKcF+5=M|BRS0Vt!`CY(&h+cN5Qky} zVjjG)OE3b_Oj`lusQ~gc0J#l7ZU>O314!0==#A*Q=N>ZowSLL|-L#(-&Gh`=7%`_J z<_#le8)DuxVopcQ?~NFja#BshxybB!$n5#Z>;=f|g~;qh$j%?YT?>ACHDvNGE9$Hh z)sTsGs2Vb{cr29vCgNugi!d0E;P(uEFX8t(e(&PKPnKp zIQ+0c_;GloK;+?Ye}Nc=!@UI}ABQ^�VU2L7J_0KIn2>g`KOjanFRTv|>4r4^uV~pr#`X1eaN^l3H<(p_A?t;YJjSqs{3#s`ow99>voF8C_ z<3UKzL-ZcTjy}fN(WjWAkprJNjA=;HGh!rqIAiDq3|YJgiTbISif+nGdRfe(UqP~7 z6^rO~NY`&f1-%IgdkcQ|w;^Tkh(>x3lJ-7)?tg`}eINq#2_)`s&|04hOz;w6ku9Py zmp8#I-YRm%HjyXJgzbA44BSh^2=R5;lQ+QbyjhGFcZ&&PhnOfH6qCd*ak$tkrif?7 z4DphfDP9({#c#zN@urw3-WNxSzu=RbpNoZ-C62d-h!SgMB`UVKM1itmY);y*;QxL>RhJ4HY|EP|*l?P53T+vBKjPolm(h5Gg^>f4V{ z-}a%t{TOfme|XzVsBgc(8(u+u`!(v@Yp8F(MSXh%Df}Mw?GJeBUEFm5_3clf{2BG_ zL)5pAP~Sd9efztG3TF*LILsPoO|D4 zX-%Z>S(E5K>u`F+nnJs+8T5=blb*9?(@WMIdfA#suUkja8`c7P*IG#LS;y1IRtbG- zRfrs`Qsi1oMZUF6jI`>+7^_~4vzo+YYq^+etr9b>W--fJBNkXKVv*Gq_x;>soPxb)C4`x=Gw^-7I!kw~Gg@JH#&Q+hVVEmw49NAzrfX z6)#)g7r(Xc6K`4%i1)1r#b2yP#OKzdsA*52zU@JM+l%_P5A|&lYyfogvA)@JwM#7Z SK2y%Rprx2m-KtmbME*ZYpc^az literal 43700 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 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAnaliticoVoucher.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAnaliticoVoucher.jrxml index 10ea2b7dd..1cd15e6b5 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAnaliticoVoucher.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAnaliticoVoucher.jrxml @@ -1,7 +1,7 @@ - + @@ -9,6 +9,7 @@ + @@ -23,6 +24,7 @@ + @@ -117,28 +119,28 @@ - + - + - + - + @@ -154,6 +156,13 @@ + + + + + + + @@ -194,33 +203,40 @@ - + - + - + - + + + + + + + + @@ -232,12 +248,12 @@ - + - + @@ -260,19 +276,26 @@ - + - + + + + + + + + @@ -291,7 +314,7 @@ - + @@ -321,6 +344,13 @@ + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImportacionFiscalController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImportacionFiscalController.java index a1557fb9e..a6334f664 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImportacionFiscalController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImportacionFiscalController.java @@ -237,7 +237,7 @@ public class BusquedaImportacionFiscalController extends MyGenericForwardCompose args.put("relatorio", relatorio); openWindow("/component/reportView.zul", - Labels.getLabel("relatorioAproveitamentoController.window.title"), args, MODAL); + Labels.getLabel("busquedaImportacionFiscalRelatorioFinanceiroController.window.title"), args, MODAL); } catch (SQLException e) { log.error(e.getMessage(), e); @@ -266,7 +266,7 @@ public class BusquedaImportacionFiscalController extends MyGenericForwardCompose args.put("relatorio", relatorio); openWindow("/component/reportView.zul", - Labels.getLabel("relatorioAproveitamentoController.window.title"), args, MODAL); + Labels.getLabel("busquedaImportacionFiscalRelatorioVoucherController.window.title"), args, MODAL); } catch (SQLException e) { log.error(e.getMessage(), e);