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

Merge pull request 'fixes bug#AL-3990' (!437) from AL-3990 into master 

Reviewed-on: adm/VentaBoletosAdm#437
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
master 1.56.2
wallace 2024-03-13 17:16:02 +00:00
parent d1372a8995 c24798fabd
commit be30135882
4 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId>
<version>1.56.1</version>
<version>1.56.2</version>
<packaging>war</packaging>
<properties>

2
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosEstoqueAgenciaNovoLayout.java
View File

@ -148,7 +148,6 @@ public class RelatorioBilhetesVendidosEstoqueAgenciaNovoLayout extends Relatorio
sql.append(" AND EM.EMPRESA_ID = AB.EMPRESA_ID ");
sql.append(" AND c.PUNTOVENTA_ID = PV.PUNTOVENTA_ID ");
sql.append(" AND DAB.AIDF_ID = AI.AIDF_ID ");
sql.append(" AND AIT.AIDFTIPO_ID = AI.AIDFTIPO_ID ");
sql.append(aidfTipoId != null ? " AND (AI.AIDFTIPO_ID =:aidfTipo AND AIT.AIDFTIPO_ID = AI.AIDFTIPO_ID) " : " AND AIT.AIDFTIPO_ID = AI.AIDFTIPO_ID ");
sql.append(aidfId != null ? " AND (AI.AIDF_ID =:aidfId AND DAB.AIDF_ID = AI.AIDF_ID) " : " AND DAB.AIDF_ID = AI.AIDF_ID ");
sql.append(" AND EM.EMPRESA_ID =:EMPRESA_ID ");
@ -215,7 +214,6 @@ public class RelatorioBilhetesVendidosEstoqueAgenciaNovoLayout extends Relatorio
sql.append(" AIT.DESCTIPO, ");
sql.append(" c.PRECIO)TB ");
sql.append(" ORDER BY to_number(TB.FOLIO) ");
System.out.println(sql.toString());
return sql.toString();

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

Binary file not shown.

2
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesVendidosEstoqueAgenciaNovoLayout.jrxml
View File

@ -230,7 +230,7 @@
</textElement>
<textFieldExpression><![CDATA[$F{origem}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true">
<textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true">
<reportElement mode="Transparent" x="555" y="2" width="62" height="18" forecolor="#000000" backcolor="#FFFFFF" uuid="b199a47a-408e-4011-8c28-f3782c664e8f"/>
<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>