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

bug#11600 

dev: julio
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@85274 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2018-09-12 17:24:51 +00:00
parent 9a05693f16
commit 9cb0ad7d2b
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java
View File

@ -2367,9 +2367,9 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
sb.append(" and f.fechorfolio >= to_date(?,'DD/MM/YYYY HH24:MI:SS') and f.fechorfolio <= to_date(?,'DD/MM/YYYY HH24:MI:SS') "); sb.append(" and f.fechorfolio >= to_date(?,'DD/MM/YYYY HH24:MI:SS') and f.fechorfolio <= to_date(?,'DD/MM/YYYY HH24:MI:SS') ");
sb.append(" and f.empresa_id = ? "); sb.append(" and f.empresa_id = ? ");
sb.append(" and eof.cveestado like ? "); sb.append(" and eof.cveestado like ? ");
sb.append(" and ((b.tipoventa_id = 3 and b.indstatusboleto = 'V' and b.indreimpresion = 0) "); sb.append(" and (f.indcancelacion = 1 or ( ((b.tipoventa_id = 3 and b.indstatusboleto = 'V' and b.indreimpresion = 0) ");
sb.append(" or (b.tipoventa_id in (12,18) and b.indstatusboleto = 'E' and b.numfoliosistema = b.numfoliopreimpreso)) "); sb.append(" or (b.tipoventa_id in (12,18) and b.indstatusboleto = 'E' and b.numfoliosistema = b.numfoliopreimpreso)) ");
sb.append(" and (b.motivocancelacion_id is null or b.motivocancelacion_id <> 35) "); sb.append(" and (b.motivocancelacion_id is null or b.motivocancelacion_id <> 35) ))");
sb.append(" order by dataEmissaoRMD "); sb.append(" order by dataEmissaoRMD ");
try { try {

3
src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/vo/ExportacaoBPR.java
View File

@ -194,6 +194,9 @@ public class ExportacaoBPR {
BigDecimal porc_red_municipal = base.getPorcReducaoMunicipal(); BigDecimal porc_red_municipal = base.getPorcReducaoMunicipal();
BigDecimal porc_red_estadual = base.getPorcReducaoEstadual(); BigDecimal porc_red_estadual = base.getPorcReducaoEstadual();
BigDecimal tributacao_importacao = base.getTributacaoImportacao(); BigDecimal tributacao_importacao = base.getTributacaoImportacao();
if (base.getDocumentoCancelado())
continue;
if (numeroAIDF == null || numeroAIDF.trim().isEmpty() || numeroAIDF.trim().equals("0")) { if (numeroAIDF == null || numeroAIDF.trim().isEmpty() || numeroAIDF.trim().equals("0")) {
continue; continue;