fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes bug #8977 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@69782 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2017-06-08 18:49:28 +00:00
parent ee7cb90285
commit b0b46f0607
5 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jasper
View File

Binary file not shown.

22
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmd.jrxml
View File

@ -118,35 +118,35 @@
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{numero}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{numero}]]></textFieldExpression>
</textField> </textField>
<textField pattern="¤ #,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="242" y="0" width="89" height="14" uuid="f8fbd690-36bd-4d69-9af4-1490ec205698"/> <reportElement x="242" y="0" width="89" height="14" uuid="f8fbd690-36bd-4d69-9af4-1490ec205698"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font size="11"/> <font size="11"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{valorContabil}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{valorContabil}]]></textFieldExpression>
</textField> </textField>
<textField pattern="¤ #,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="331" y="0" width="94" height="14" uuid="21f2b8f9-1acd-4e7d-bb27-643cfae50748"/> <reportElement x="331" y="0" width="94" height="14" uuid="21f2b8f9-1acd-4e7d-bb27-643cfae50748"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font size="11"/> <font size="11"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{baseCalculo}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{baseCalculo}]]></textFieldExpression>
</textField> </textField>
<textField pattern="¤ #,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="425" y="0" width="42" height="14" uuid="565fe3d7-bce7-480f-829f-0238cf7d2d74"/> <reportElement x="425" y="0" width="42" height="14" uuid="565fe3d7-bce7-480f-829f-0238cf7d2d74"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font size="11"/> <font size="11"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{aliquota}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{aliquota}]]></textFieldExpression>
</textField> </textField>
<textField pattern="¤ #,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="467" y="0" width="90" height="14" uuid="c07a3fa8-12c6-4a5b-8707-02c0524f943c"/> <reportElement x="467" y="0" width="90" height="14" uuid="c07a3fa8-12c6-4a5b-8707-02c0524f943c"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font size="11"/> <font size="11"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{icms}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{icms}]]></textFieldExpression>
</textField> </textField>
<textField pattern="¤ #,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="633" y="0" width="87" height="14" uuid="4f082fb1-15bc-41f6-985e-0f670459fceb"/> <reportElement x="633" y="0" width="87" height="14" uuid="4f082fb1-15bc-41f6-985e-0f670459fceb"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font size="11"/> <font size="11"/>
@ -160,7 +160,7 @@
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{obs}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{obs}]]></textFieldExpression>
</textField> </textField>
<textField pattern="¤ #,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="557" y="0" width="76" height="14" uuid="60865331-9449-4435-8b4a-664b747a90b3"/> <reportElement x="557" y="0" width="76" height="14" uuid="60865331-9449-4435-8b4a-664b747a90b3"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font size="11"/> <font size="11"/>
@ -171,35 +171,35 @@
</detail> </detail>
<pageFooter> <pageFooter>
<band height="153"> <band height="153">
<textField pattern="¤ #,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="242" y="0" width="89" height="17" uuid="e6c0383c-5062-4b22-989b-d1619add3ade"/> <reportElement x="242" y="0" width="89" height="17" uuid="e6c0383c-5062-4b22-989b-d1619add3ade"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font size="11"/> <font size="11"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{sum_valorContabil}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{sum_valorContabil}]]></textFieldExpression>
</textField> </textField>
<textField pattern="¤ #,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="331" y="0" width="94" height="17" uuid="810c93ac-4d8b-4edb-800c-ec2753286bb1"/> <reportElement x="331" y="0" width="94" height="17" uuid="810c93ac-4d8b-4edb-800c-ec2753286bb1"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font size="11"/> <font size="11"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{sum_baseCalculo}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{sum_baseCalculo}]]></textFieldExpression>
</textField> </textField>
<textField pattern="¤ #,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="467" y="0" width="90" height="17" uuid="0a93d431-1b76-4590-aa1b-9af22283a5b3"/> <reportElement x="467" y="0" width="90" height="17" uuid="0a93d431-1b76-4590-aa1b-9af22283a5b3"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font size="11"/> <font size="11"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{sum_icms}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{sum_icms}]]></textFieldExpression>
</textField> </textField>
<textField pattern="¤ #,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="557" y="0" width="76" height="17" uuid="748316ed-feb8-4a2d-9103-764eeb74873d"/> <reportElement x="557" y="0" width="76" height="17" uuid="748316ed-feb8-4a2d-9103-764eeb74873d"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font size="11"/> <font size="11"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{sum_isentos}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{sum_isentos}]]></textFieldExpression>
</textField> </textField>
<textField pattern="¤ #,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="633" y="0" width="87" height="17" uuid="66628be0-d424-4d61-96dc-aaf8652ded42"/> <reportElement x="633" y="0" width="87" height="17" uuid="66628be0-d424-4d61-96dc-aaf8652ded42"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font size="11"/> <font size="11"/>

BIN
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jasper
View File

Binary file not shown.

24
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioImpressaoRmdBpr.jrxml
View File

@ -121,35 +121,35 @@
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{numero}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{numero}]]></textFieldExpression>
</textField> </textField>
<textField pattern="¤ #,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="169" y="0" width="92" height="14" uuid="f8fbd690-36bd-4d69-9af4-1490ec205698"/> <reportElement x="169" y="0" width="92" height="14" uuid="f8fbd690-36bd-4d69-9af4-1490ec205698"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font fontName="SansSerif" size="10"/> <font fontName="SansSerif" size="10"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{valorContabil}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{valorContabil}]]></textFieldExpression>
</textField> </textField>
<textField pattern="¤ #,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="261" y="0" width="104" height="14" uuid="21f2b8f9-1acd-4e7d-bb27-643cfae50748"/> <reportElement x="261" y="0" width="104" height="14" uuid="21f2b8f9-1acd-4e7d-bb27-643cfae50748"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font fontName="SansSerif" size="11"/> <font fontName="SansSerif" size="11"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{baseCalculo}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{baseCalculo}]]></textFieldExpression>
</textField> </textField>
<textField pattern="¤ #,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="365" y="0" width="40" height="14" uuid="565fe3d7-bce7-480f-829f-0238cf7d2d74"/> <reportElement x="365" y="0" width="40" height="14" uuid="565fe3d7-bce7-480f-829f-0238cf7d2d74"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font fontName="SansSerif" size="11"/> <font fontName="SansSerif" size="11"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{aliquota}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{aliquota}]]></textFieldExpression>
</textField> </textField>
<textField pattern="¤ #,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="405" y="0" width="93" height="14" uuid="c07a3fa8-12c6-4a5b-8707-02c0524f943c"/> <reportElement x="405" y="0" width="93" height="14" uuid="c07a3fa8-12c6-4a5b-8707-02c0524f943c"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font fontName="SansSerif" size="11"/> <font fontName="SansSerif" size="11"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{icms}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{icms}]]></textFieldExpression>
</textField> </textField>
<textField pattern="¤ #,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="608" y="0" width="115" height="14" uuid="4f082fb1-15bc-41f6-985e-0f670459fceb"/> <reportElement x="608" y="0" width="115" height="14" uuid="4f082fb1-15bc-41f6-985e-0f670459fceb"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font fontName="SansSerif" size="11"/> <font fontName="SansSerif" size="11"/>
@ -163,7 +163,7 @@
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{obs}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{obs}]]></textFieldExpression>
</textField> </textField>
<textField pattern="¤ #,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="498" y="0" width="110" height="14" uuid="60865331-9449-4435-8b4a-664b747a90b3"/> <reportElement x="498" y="0" width="110" height="14" uuid="60865331-9449-4435-8b4a-664b747a90b3"/>
<textElement textAlignment="Right"> <textElement textAlignment="Right">
<font fontName="SansSerif" size="11"/> <font fontName="SansSerif" size="11"/>
@ -173,36 +173,36 @@
</band> </band>
</detail> </detail>
<pageFooter> <pageFooter>
<band height="153"> <band height="155">
<textField pattern="¤ #,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="169" y="0" width="92" height="18" uuid="e6c0383c-5062-4b22-989b-d1619add3ade"/> <reportElement x="169" y="0" width="92" height="18" uuid="e6c0383c-5062-4b22-989b-d1619add3ade"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font fontName="SansSerif" size="10"/> <font fontName="SansSerif" size="10"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{sum_valorContabil}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{sum_valorContabil}]]></textFieldExpression>
</textField> </textField>
<textField pattern="¤ #,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="261" y="0" width="104" height="18" uuid="810c93ac-4d8b-4edb-800c-ec2753286bb1"/> <reportElement x="261" y="0" width="104" height="18" uuid="810c93ac-4d8b-4edb-800c-ec2753286bb1"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font fontName="SansSerif" size="11"/> <font fontName="SansSerif" size="11"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{sum_baseCalculo}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{sum_baseCalculo}]]></textFieldExpression>
</textField> </textField>
<textField pattern="¤ #,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="405" y="0" width="93" height="18" uuid="0a93d431-1b76-4590-aa1b-9af22283a5b3"/> <reportElement x="405" y="0" width="93" height="18" uuid="0a93d431-1b76-4590-aa1b-9af22283a5b3"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font fontName="SansSerif" size="11"/> <font fontName="SansSerif" size="11"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{sum_icms}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{sum_icms}]]></textFieldExpression>
</textField> </textField>
<textField pattern="¤ #,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="498" y="0" width="110" height="18" uuid="748316ed-feb8-4a2d-9103-764eeb74873d"/> <reportElement x="498" y="0" width="110" height="18" uuid="748316ed-feb8-4a2d-9103-764eeb74873d"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font fontName="SansSerif" size="11"/> <font fontName="SansSerif" size="11"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$V{sum_isentos}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{sum_isentos}]]></textFieldExpression>
</textField> </textField>
<textField pattern="¤ #,##0.00" isBlankWhenNull="true"> <textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="608" y="0" width="115" height="18" uuid="66628be0-d424-4d61-96dc-aaf8652ded42"/> <reportElement x="608" y="0" width="115" height="18" uuid="66628be0-d424-4d61-96dc-aaf8652ded42"/>
<textElement textAlignment="Right" verticalAlignment="Middle"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font fontName="SansSerif" size="11"/> <font fontName="SansSerif" size="11"/>

3
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImpressaoRMDController.java
View File

@ -7,6 +7,7 @@ import java.util.Map;
import javax.sql.DataSource; import javax.sql.DataSource;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
@ -144,7 +145,7 @@ public class BusquedaImpressaoRMDController extends MyGenericForwardComposer {
} }
String folio = folioInicial.getValue(); String folio = folioInicial.getValue();
if (folio == null) { if (StringUtils.isBlank(folio)) {
Messagebox.show( Messagebox.show(
Labels.getLabel("busquedaImpressaoRMDController.select.RMD"), Labels.getLabel("busquedaImpressaoRMDController.select.RMD"),
Labels.getLabel("busquedaImpressaoRMDController.mnImpressaoRMD.label"), Labels.getLabel("busquedaImpressaoRMDController.mnImpressaoRMD.label"),