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

fixes bug 6555 correções diversas 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@49616 d1611594-4594-4d17-8e1d-87c2c4800839
master
igor.rodrigo 2015-10-29 19:24:34 +00:00
parent 9a78103542
commit d6ec2c0966
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCancelamentoVendaCartao.java
View File

@ -91,16 +91,15 @@ public class RelatorioCancelamentoVendaCartao extends Relatorio {
sql.append(" 'OCD' as descmotivo, ctj.numautorizacion, ctj.nsu, c.numfoliosistema, o.fecmodif as datadevolucao"); sql.append(" 'OCD' as descmotivo, ctj.numautorizacion, ctj.nsu, c.numfoliosistema, o.fecmodif as datadevolucao");
sql.append(" from OCD o"); sql.append(" from OCD o");
sql.append(" inner join boleto b on o.BOLETO_ID = b.BOLETO_ID"); sql.append(" inner join boleto b on o.BOLETO_ID = b.BOLETO_ID");
sql.append(" inner join caja_det_pago cdt on cdt.NUMOPERACION = b.NUMOPERACION"); sql.append(" inner join caja c on c.numoperacion = b.numoperacion and b.numfoliosistema = c.numfoliosistema");
sql.append(" inner join caja_det_pago cdt ON cdt.caja_id = c.caja_id and cdt.formapago_id in (:formaPago1)");
sql.append(" inner join caja_tarjeta ctj on cdt.cajadetpago_id = ctj.cajadetpago_id"); sql.append(" inner join caja_tarjeta ctj on cdt.cajadetpago_id = ctj.cajadetpago_id");
sql.append(" inner join punto_venta p on p.puntoventa_id = b.puntoventa_id"); sql.append(" inner join punto_venta p on p.puntoventa_id = o.puntoventa_id");
sql.append(" inner join ptovta_empresa ptovta on b.puntoventa_id = ptovta.puntoventa_id"); sql.append(" inner join ptovta_empresa ptovta on b.puntoventa_id = ptovta.puntoventa_id");
if(parametros.get("EMPRESA_ID") != null){ if(parametros.get("EMPRESA_ID") != null){
sql.append(" inner join empresa e on p.empresa_id = e.empresa_id and p.empresa_id = " + parametros.get("EMPRESA_ID") ); sql.append(" inner join empresa e on p.empresa_id = e.empresa_id and p.empresa_id = " + parametros.get("EMPRESA_ID") );
} }
sql.append(" inner join caja c on c.NUMOPERACION = b.NUMOPERACION");
sql.append(" inner join marca m on m.marca_id = b.marca_id "); sql.append(" inner join marca m on m.marca_id = b.marca_id ");
sql.append(" inner join caja_formapago cf on c.caja_id = cf.caja_id");
sql.append(" and m.EMPRESA_ID = ptovta.EMPRESA_ID"); sql.append(" and m.EMPRESA_ID = ptovta.EMPRESA_ID");
sql.append(" and c.fechorventa >= :data_inicial and c.fechorventa <= :data_final "); sql.append(" and c.fechorventa >= :data_inicial and c.fechorventa <= :data_final ");
if (parametros.get("NUMPUNTOVENTA") != null) { if (parametros.get("NUMPUNTOVENTA") != null) {

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

Binary file not shown.

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

@ -278,7 +278,7 @@
<textFieldExpression><![CDATA[$F{nsu}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{nsu}]]></textFieldExpression>
</textField> </textField>
<textField pattern=""> <textField pattern="">
<reportElement uuid="1c166449-6aa5-4558-8bc1-56750b9d8b0a" x="740" y="-3" width="33" height="17"/> <reportElement uuid="1c166449-6aa5-4558-8bc1-56750b9d8b0a" x="740" y="-3" width="61" height="17"/>
<textElement> <textElement>
<font size="10" isBold="false" isItalic="false"/> <font size="10" isBold="false" isItalic="false"/>
</textElement> </textElement>