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

fixes bug#11303 

dev:thiago
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@82505 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2018-06-08 19:23:10 +00:00
parent 4f36266044
commit 79fdc2750b
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/rjconsultores/ventaboletos/entidad/AliasServico.java
View File

@ -53,6 +53,11 @@ public class AliasServico implements Serializable {
private Integer usuarioId; private Integer usuarioId;
@Column(name = "INDIDALIASORIGINAL") @Column(name = "INDIDALIASORIGINAL")
private Boolean indIdAliasOriginal; private Boolean indIdAliasOriginal;
public AliasServico() {
super();
this.indIdAliasOriginal = false;
}
public Integer getAliasServicoId() { public Integer getAliasServicoId() {
return aliasServicoId; return aliasServicoId;

7
src/com/rjconsultores/ventaboletos/service/impl/CalculoComissaoServiceImpl.java
View File

@ -3,7 +3,6 @@ package com.rjconsultores.ventaboletos.service.impl;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar; import java.util.Calendar;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
@ -310,7 +309,7 @@ public class CalculoComissaoServiceImpl implements CalculoComissaoService {
public RegistroCalculo realizarCalculoComissao(Integer puntoVentaId, Integer empresaId, Date periodo, Boolean isRetencaoDiaria, Integer usuarioId, Boolean isRefazerCalculo) throws ComissaoException, BusinessException { public RegistroCalculo realizarCalculoComissao(Integer puntoVentaId, Integer empresaId, Date periodo, Boolean isRetencaoDiaria, Integer usuarioId, Boolean isRefazerCalculo) throws ComissaoException, BusinessException {
PtovtaComissao ptovtaComissao = ptovtaComissaoService.buscarPuntaVentaEmpresa(puntoVentaId, empresaId); PtovtaComissao ptovtaComissao = ptovtaComissaoService.buscarPuntaVentaEmpresa(puntoVentaId, empresaId);
if (ptovtaComissao != null) { if (ptovtaComissao != null && (ptovtaComissao.getIndretercomissao() == null || !ptovtaComissao.getIndretercomissao())) {
//Abate no valor da comissão bpr as saídas de caixa //Abate no valor da comissão bpr as saídas de caixa
boolean consideraBilhetesDevolvidosEmOutraAgencia = (ptovtaComissao.getIndbilhetesdevcanorigem() == null)?false:ptovtaComissao.getIndbilhetesdevcanorigem(); boolean consideraBilhetesDevolvidosEmOutraAgencia = (ptovtaComissao.getIndbilhetesdevcanorigem() == null)?false:ptovtaComissao.getIndbilhetesdevcanorigem();
@ -357,7 +356,9 @@ public class CalculoComissaoServiceImpl implements CalculoComissaoService {
return calcularRegistroCalculo(ptovtaComissao, puntoVentaId, empresaId, periodo, receitas); return calcularRegistroCalculo(ptovtaComissao, puntoVentaId, empresaId, periodo, receitas);
} }
} else { } else {
if(!isRefazerCalculo) { if(ptovtaComissao != null && ptovtaComissao.getIndretercomissao() != null && ptovtaComissao.getIndretercomissao()) {
throw new ComissaoException("busquedaCalculoComissaoController.PtovtaComissaoReterComissao.exception", null, ptovtaComissao.getDescComissaoId() != null ? ptovtaComissao.getPuntoventaId().getNombpuntoventa() : "");
} else if(!isRefazerCalculo) {
throw new ComissaoException("busquedaCalculoComissaoController.PtovtaComissao.exception"); throw new ComissaoException("busquedaCalculoComissaoController.PtovtaComissao.exception");
} }
} }