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/Model/trunk/modelWeb@70032 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2017-06-19 12:33:17 +00:00
parent 8c37d09f8c
commit 672baee24f
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2667,10 +2667,12 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
sql.append(" a.subserie as subSerieAidf, ");
sql.append(" trunc(b.fechorventa) as fechorVenta, ");
sql.append(" e.nombempresa as empresa, ");
sql.append(" e.cnpj as cnpjEmpresa, ");
sql.append(" e.logradouro || ', ' || e.numero || ' - ' || e.bairro || ', ' || ce.nombciudad ");
sql.append(" || ' - ' || ee.cveestado || ', ' || e.cep ");
sql.append(" as enderecoEmpresa, ");
sql.append(" coalesce(ie.cnpj, e.cnpj) as cnpjEmpresa, ");
sql.append(" case when ie.logradouro is null ");
sql.append(" then (e.logradouro || ', ' || e.numero || ' - ' || e.bairro || ', ' || ce.nombciudad ");
sql.append(" || ' - ' || ee.cveestado || ', ' || e.cep ) ");
sql.append(" else (ie.logradouro || ', ' || ie.numero || ' - ' || ie.bairro || ', ' || ce.nombciudad ");
sql.append(" || ' - ' || ee.cveestado || ', ' || ie.cep ) end as enderecoEmpresa, ");
sql.append(" pv.nombpuntoventa as nombPuntoVenta, ");
sql.append(" pv.numpuntoventa as numPuntoVenta, ");
sql.append(" ie.numinscricaoestadual as ieEmpresa, ");
@ -2748,11 +2750,13 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
sql.append(" a.serie as serieAidf, ");
sql.append(" a.subserie as subSerieAidf, ");
sql.append(" trunc(b.fechorventa) as fechorVenta, ");
sql.append(" e.nombempresa as empresa, ");
sql.append(" e.cnpj as cnpjEmpresa, ");
sql.append(" e.logradouro || ', ' || e.numero || ' - ' || e.bairro || ', ' || ce.nombciudad ");
sql.append(" || ' - ' || ee.cveestado || ', ' || e.cep ");
sql.append(" as enderecoEmpresa, ");
sql.append(" e.nombempresa as empresa, ");
sql.append(" coalesce(ie.cnpj, e.cnpj) as cnpjEmpresa, ");
sql.append(" case when ie.logradouro is null ");
sql.append(" then (e.logradouro || ', ' || e.numero || ' - ' || e.bairro || ', ' || ce.nombciudad ");
sql.append(" || ' - ' || ee.cveestado || ', ' || e.cep ) ");
sql.append(" else (ie.logradouro || ', ' || ie.numero || ' - ' || ie.bairro || ', ' || ce.nombciudad ");
sql.append(" || ' - ' || ee.cveestado || ', ' || ie.cep ) end as enderecoEmpresa, ");
sql.append(" pv.nombpuntoventa as nombPuntoVenta, ");
sql.append(" pv.numpuntoventa as numPuntoVenta, ");
sql.append(" ie.numinscricaoestadual as ieEmpresa, ");