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

Exportação Fiscal : ECF e RMD (issue 8120) 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@73380 d1611594-4594-4d17-8e1d-87c2c4800839
master
alberto 2017-08-31 18:36:15 +00:00
parent 4bad21b6ad
commit 69fabe6431
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2473,7 +2473,8 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
Integer municipioOrigem = rs.getInt("municipioOrigem");
Integer municipioDestino = rs.getInt("municipioDestino");
Integer municipioOrigemPadrao = rs.getInt("municipioOrigemPadrao");
Integer cfop = rs.getInt("cfop");
if (ufOrigem != null && ufDestino != null) {
if (!ufOrigem.equals(cveestado)) {
if (ufDestino.equals(cveestado)) {
@ -2483,6 +2484,8 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
ufOrigem = cveestado;
municipioOrigem = municipioOrigemPadrao;
}
cfop = (ufOrigem.equals(ufDestino) ? 5357 : 6357);
}
}
@ -2527,7 +2530,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
registro.setUfDestino(ufDestino);
registro.setUfOrigem(ufOrigem);
registro.setMunicipioOrigem(municipioOrigem);
registro.setCfop(rs.getInt("cfop"));
registro.setCfop(cfop);
registro.setReducaoBaseCalcICMS(rs.getBigDecimal("reducaoBaseCalcICMS"));
registro.setPorcReducaoMunicipal(rs.getBigDecimal("porcReducaoMunicipal"));
registro.setPorcReducaoEstadual(rs.getBigDecimal("porcReducaoEstadual"));

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

@ -131,7 +131,7 @@ public class ExportacaoBPR {
registro.setCodigoParticipante(base.getCodigoParticipante());
registro.setCodigoEstabelecimento(base.getCodigoEstabelecimento());
registro.setNumeroAIDF(base.getNumeroAIDFRMD());
registro.setSerieAIDF(base.getSubSerieAIDFRMD());
registro.setSerieAIDF(base.getSerieAIDFRMD());
registro.setSubSerieAIDF(base.getSubSerieAIDFRMD());
registro.setNumeroBilheteAIDF(base.getNumeroFormularioBilheteAIDF());
registro.setNumeroFormularioAIDF(base.getNumeroFormularioBilheteAIDF());