From 3a5f0c2827d8e0fc99219cd338ad50dcb2d81f34 Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Sat, 26 Aug 2017 13:45:24 +0000
Subject: [PATCH] fixes bug #9387

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@73128 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../impl/RelatorioDevolucaoBilhetes.java      |  72 ++++++++++++------
 .../RelatorioDevolucaoBilhetes.jasper         | Bin 70005 -> 69666 bytes
 .../RelatorioDevolucaoBilhetes.jrxml          |  26 +++----
 3 files changed, 62 insertions(+), 36 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java
index b34acee3f..5e3160fef 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java
@@ -16,6 +16,7 @@ import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DevolucaoBilhetes;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
 import com.rjconsultores.ventaboletos.utilerias.DateUtil;
+import com.rjconsultores.ventaboletos.utilerias.MoneyHelper;
 import com.rjconsultores.ventaboletos.utilerias.UtiliteriasFiscal;
 import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
 
@@ -165,34 +166,59 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
 					}
 					db.setValorContabil(valorContabil);
 					
-					BigDecimal valorIcms = BigDecimal.ZERO;
-					if(isEstadual) {
-						if(db.getTributacaoimportacao() == null) {
-							valorIcms = db.getValorContabil().multiply(db.getIcmsInterestadual().divide(UtiliteriasFiscal.CEM));
-						} else {
-							valorIcms = db.getValorContabil().multiply(db.getTributacaoimportacao().divide(UtiliteriasFiscal.CEM));
-						}
-					} else {
-						valorIcms = db.getValorContabil().multiply(db.getIcmsIntermunicipal().divide(UtiliteriasFiscal.CEM));
-					}
-					if(db.isIsenta()) {
-						db.setValorIsenta(valorIcms);
-					} else {
-						db.setValorIcms(valorIcms);
-					}
-					
 					db.setPorcMunicipal(rset.getBigDecimal("PORC_MUNICIPAL"));
 					db.setPorcEstadual(rset.getBigDecimal("PORC_ESTADUAL"));
 					
-					BigDecimal estornoMunicipal = BigDecimal.ZERO;
-					BigDecimal estornoEstadual = BigDecimal.ZERO;
-					if (isEstadual) {
-						estornoEstadual = valorIcms.multiply(db.getPorcEstadual().divide(UtiliteriasFiscal.CEM));
+					BigDecimal redBaseCalcIcms = BigDecimal.ZERO;
+					if(MoneyHelper.isMaior(db.getPorcredbaseicms(), BigDecimal.ZERO)) {
+						redBaseCalcIcms = db.getPorcredbaseicms().divide(UtiliteriasFiscal.CEM);
 					} else {
-						estornoMunicipal = valorIcms.multiply(db.getPorcMunicipal().divide(UtiliteriasFiscal.CEM));
+						if(isEstadual) {
+							if(MoneyHelper.isMaior(db.getPorcEstadual(), BigDecimal.ZERO)) {
+								redBaseCalcIcms = db.getPorcEstadual().divide(UtiliteriasFiscal.CEM);
+							} else if(db.getTributacaoimportacao() == null) {
+								redBaseCalcIcms = db.getIcmsInterestadual().divide(UtiliteriasFiscal.CEM);
+							} else {
+								redBaseCalcIcms = db.getTributacaoimportacao().divide(UtiliteriasFiscal.CEM);
+							}
+						} else {
+							if(MoneyHelper.isMaior(db.getPorcEstadual(), BigDecimal.ZERO)) {
+								redBaseCalcIcms = db.getPorcEstadual().divide(UtiliteriasFiscal.CEM);
+							} else {
+								redBaseCalcIcms = db.getIcmsIntermunicipal().divide(UtiliteriasFiscal.CEM);
+							}
+						}
+					}
+					
+					BigDecimal valorIcms = BigDecimal.ZERO;
+					if(db.isIsenta()) {
+						db.setValorIsenta(valorContabil);
+					} else {
+						BigDecimal redutor = valorContabil.multiply(redBaseCalcIcms);
+						valorIcms = valorContabil.subtract(redutor);
+						
+						if(isEstadual) {
+							if(db.getTributacaoimportacao() == null) {
+								valorIcms = db.getValorContabil().multiply(db.getIcmsInterestadual().divide(UtiliteriasFiscal.CEM));
+							} else {
+								valorIcms = db.getValorContabil().multiply(db.getTributacaoimportacao().divide(UtiliteriasFiscal.CEM));
+							}
+						} else {
+							valorIcms = db.getValorContabil().multiply(db.getIcmsIntermunicipal().divide(UtiliteriasFiscal.CEM));
+						}
+						db.setValorIcms(valorIcms);
+					}
+					
+					db.setEstornoEstadual(BigDecimal.ZERO);
+					db.setEstornoMunicipal(BigDecimal.ZERO);
+					
+					if(!db.isIsenta()) {
+						if (isEstadual) {
+							db.setEstornoEstadual(valorIcms);
+						} else {
+							db.setEstornoMunicipal(valorIcms);
+						}
 					}
-					db.setEstornoMunicipal(estornoMunicipal);
-					db.setEstornoEstadual(estornoEstadual);
 
 					lsDev.add(db);
 				}
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jasper
index 859011db51ab6ddc8d6125bb95841b2549141c90..1fa57908a83f2722737fa7ad7fafc4339b4173da 100644
GIT binary patch
delta 12926
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

delta 13683
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

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml
index 77df9632c..9ad4c097f 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDevolucaoBilhetes.jrxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioDevolucaoBilhetes" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
 	<property name="ireport.zoom" value="1.5"/>
-	<property name="ireport.x" value="275"/>
-	<property name="ireport.y" value="0"/>
+	<property name="ireport.x" value="477"/>
+	<property name="ireport.y" value="124"/>
 	<style name="textStyle" isDefault="true" fontSize="6" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false"/>
 	<style name="table">
 		<box>
@@ -145,7 +145,7 @@
 					<textElement>
 						<font size="6"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$R{label.impEstornarInterestadual}+" ( " + $F{porcEstadual} + "% )"]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$R{label.impEstornarInterestadual}]]></textFieldExpression>
 				</textField>
 				<line>
 					<reportElement x="0" y="0" width="800" height="1" uuid="ddbec772-7ac5-4ca7-8bd9-f4d556cd8015"/>
@@ -155,23 +155,23 @@
 					<textElement>
 						<font size="6"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$R{label.impEstornarIntermunicipal}+" ( " + $F{porcMunicipal} + "% )"]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$R{label.impEstornarIntermunicipal}]]></textFieldExpression>
 				</textField>
-				<textField pattern="###0.00">
+				<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
 					<reportElement x="288" y="15" width="72" height="14" uuid="ac8a5a5d-6d23-445c-925f-81a506de6e5e"/>
 					<textElement textAlignment="Right">
 						<font size="6"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{estornoMunicipal_1}]]></textFieldExpression>
 				</textField>
-				<textField pattern="###0.00">
+				<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
 					<reportElement x="288" y="1" width="72" height="14" uuid="824c2026-e1ef-459e-88d3-a746acff0dad"/>
 					<textElement textAlignment="Right">
 						<font size="6"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{estornoEstadual_1}]]></textFieldExpression>
 				</textField>
-				<textField pattern="###0.00">
+				<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
 					<reportElement x="288" y="29" width="72" height="14" uuid="10545815-fcf1-40b9-b645-7d1e3097cf0c"/>
 					<textElement textAlignment="Right">
 						<font size="6"/>
@@ -640,37 +640,37 @@
 				<textFieldExpression><![CDATA[$R{label.qtdeBilhetes}]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement positionType="Float" x="1" y="15" width="800" height="1" uuid="ff50b0f9-831b-428e-9177-b264920c542b"/>
+				<reportElement positionType="Float" x="1" y="16" width="800" height="1" uuid="ff50b0f9-831b-428e-9177-b264920c542b"/>
 			</line>
-			<textField pattern="###0.00">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
 				<reportElement stretchType="RelativeToTallestObject" x="447" y="1" width="94" height="14" uuid="5bb73e4d-a51b-4a04-bed0-8fa3eb7f8553"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{precioPagado_total}]]></textFieldExpression>
 			</textField>
-			<textField pattern="###0.00">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
 				<reportElement stretchType="RelativeToTallestObject" x="541" y="1" width="74" height="14" uuid="7c3ce565-f549-48d2-815d-9b4d7a39b1ca"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{vTotalContabil}]]></textFieldExpression>
 			</textField>
-			<textField pattern="###0.00">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
 				<reportElement stretchType="RelativeToTallestObject" x="662" y="1" width="46" height="14" uuid="7a2dbe9b-868e-46db-b3b3-6e759d4dba98"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{valorIcms_total}]]></textFieldExpression>
 			</textField>
-			<textField pattern=" ###0.00" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
 				<reportElement stretchType="RelativeToTallestObject" x="750" y="1" width="52" height="14" uuid="fba9c1d7-5a33-4229-9371-31aacc2a9fbb"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{vTotalOutras}]]></textFieldExpression>
 			</textField>
-			<textField pattern=" ###0.00" isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
 				<reportElement stretchType="RelativeToTallestObject" x="708" y="1" width="42" height="14" uuid="e6928dff-a4be-42a7-bb7e-281a23110d3a"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="6"/>