From 2f10c775f08fbb0e95409fc89869a26b81115cbe Mon Sep 17 00:00:00 2001 From: julio Date: Sun, 27 Aug 2017 13:25:05 +0000 Subject: [PATCH] fixes bug #9608 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@73173 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioFinanceiroSintetico.java | 5 +++- .../templates/RelatorioFolioRmd.jasper | Bin 34755 -> 35039 bytes .../templates/RelatorioFolioRmd.jrxml | 24 +++++++++--------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroSintetico.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroSintetico.java index 5343a7440..2a015ed8f 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroSintetico.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroSintetico.java @@ -72,9 +72,12 @@ public class RelatorioFinanceiroSintetico extends Relatorio { fs.setUf(rset.getString("uf")); fs.setCodigoAgencia(rset.getString("codigo")); - fs.setReceitaBPR(getBigDecimal(rset, "receita_bpr")); + BigDecimal receitaBPR = getBigDecimal(rset, "receita_bpr"); fs.setGapVenda(getBigDecimal(rset, "receita_gap")); fs.setGapImpressa(getBigDecimal(rset, "entrega_gap")); + + receitaBPR = receitaBPR.add(fs.getGapImpressa()); + fs.setReceitaBPR(receitaBPR); BigDecimal totalVendaPassagens = fs.getReceitaBPR().add(fs.getGapVenda()); totalVendaPassagens = totalVendaPassagens.subtract(fs.getGapImpressa()); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFolioRmd.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioFolioRmd.jasper index bb160df433218f6d3141f5ab3494f6675b42b3a9..417a93cd87036f41e7833f56b34736c386e65fb2 100644 GIT binary patch delta 5695 zcmaKwZA@F&8OQH61VS%_ffEXZV9ZOxJLa7%&5JPxkpc#rEU$zZFqG6_gYBg0wp9C& z6h*6=>6C7n_5qX+>!xZMLer$FRhD*Bx3vqEwsngpwb8yrtENbmqIB!JXy_x2E zYDrbm(oEAXd0oEQq;ubDN^*06i$Oy!)ySpPg3B7m;jfv|3?vBj< zSZF>TiSdWL(Y#A!wdV4j(At_bQ3ob4)SwBf(FCOyCRhU|SYt9#BTeiS*=<_Z9lYTb zWv3{sDq;Tdwj{qD_!wG|Pc`x>wcxV`_^dJUTj3(CH?^m$YB#c`>u*QTrioUR}qfsO@vcw0cQ=sS!0630kA=Qab)uxS|z&Ob_Pe?ecBo@G2B8h)d;540?Zl! zv&ICzh2ZJ#s^qR~#I5dJ2H)%M({2M8!`ld^8o`uWfLQ}z)|kL=BY4BJdF*cxyLwuFEM& z?B**~Zb}Z*79xrGBE4v7l(sNCIj3KhYXiI2dk4d+Y(ET?i$4w7)fVyhp>kPg`-)_~ z*H@AGxxDys#U+|EOGMaLT;8IpFpzW99T@id$Nk=6pMMlTMU|x0EX@`l`ZDAqfA*Ei z1t0qylRWh+G-rI!ePZ0>J2sRuJMVn(La;F$oS$jzpO1%TLW{Vzjpyd`+#dI+dpzJf z=J$Bb?AM0#CHIHJd)RyvI(je+TT(}grJItG5}EHGsgU{DNTp+ov(f%R@AxU-kiNE9 z87Yb z>7b`igt)Ilk_bZVgZNB>*&35xcd_Ek!3hQ~K>Y;ee|Rul$bKiyS)18?5c2M&JXv8{?% z21;^myfX!Nc31rSw5yP&7$3v`GvUmc`kgc(lOMuOanY95;XzlzilS)3-DwxkdY^(5 zx{ao1(8Ibp+vF{KtR|1N>F@|Am4)e-7nNu59&>HqCKkpzGn%4uh@My&+8A3_zre%h zOJ@(i^aP+7zQj*g88>`aqQ(X&Ap4E0!KhvdUp@-j|^YfMI2=dAQcv>O2!BAk~ zhPoDRjExjG)Ic|^F}W!~H`Noz+0FMS4u7o*Y+$Icut8l58^%V84Qikb)|hNmppB); zFx$wTs#cpt*Hk;#OH;{<)B)}=v{|^Lu7x{eBgGvx&>d?`?%KfJ`ir60RP~=Cccw_j znwctfN%&?8WqfXCu%N5W)!MbcxwCz|tHZUwr6W^ORi$1mY%3AJJfFG#aOS!rZ>uIQ ZJ}WL28`D`iN9CJm(i54B&W1ya{{;ZL5&8fC delta 5862 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 w)1KztPYyLSH8wWyS^4M5Ul(O - + @@ -206,42 +206,42 @@ - + - + - + - + - + - + @@ -255,28 +255,28 @@ - + - + - + - + @@ -293,7 +293,7 @@ - +