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

Merge pull request 'AL-2550' (!127) from AL-2550 into master 

Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/127
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
master 1.0.105
Julio Heredia 2023-04-25 19:34:50 +00:00
parent e36e9ddbdb f654182b6f
commit 53b651e02b
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId>
<version>1.0.104</version>
<version>1.0.105</version>
<packaging>war</packaging>
<properties>

17
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaDiariaAgencia.java
View File

@ -242,12 +242,19 @@ public class RelatorioReceitaDiariaAgencia extends Relatorio {
}
BigDecimal imposto = getValorImposto(this.resultSet.getInt("ORIGEM_ESTADO_ID"),
this.resultSet.getInt("EMPRESA_ID"), this.resultSet.getString("INTERESTADUAL"),
this.resultSet.getBigDecimal("PRECIOPAGADO"), this.resultSet.getBigDecimal("IMPORTESEGURO"),
this.resultSet.getBigDecimal("IMPORTETAXAEMBARQUE"),
this.resultSet.getBigDecimal("IMPORTEPEDAGIO"), BigDecimal.ZERO);
// Caso esteje setado na configuração de comissão que o calculo deve ser sobre o liquido, deduz o imposto.
if (configComissao.get("RECEITA") != null && ((String) configComissao.get("RECEITA")).equals("RL") &&
(!tipoVentaId.equals(18) || (tipoVentaId.equals(18) && (Boolean) this.relatorio.getParametros().get("B_CONTEMPLAR_GAP"))) &&
rowOrigem.get("IMPOSTOS") != null) {
baseCalculo = baseCalculo.subtract((BigDecimal) rowOrigem.get("IMPOSTOS"));
baseCalculoSeguro = baseCalculoSeguro.subtract((BigDecimal) rowOrigem.get("IMPOSTOS"));
if (configComissao.get("RECEITA") != null && ((String) configComissao.get("RECEITA")).equals("RL")
&& (!tipoVentaId.equals(18) || (tipoVentaId.equals(18)
&& (Boolean) this.relatorio.getParametros().get("B_CONTEMPLAR_GAP")))
&& imposto != null) {
baseCalculo = baseCalculo.subtract(imposto);
baseCalculoSeguro = baseCalculoSeguro.subtract(imposto);
}
if (MoneyHelper.isMenorIgual(baseCalculo, BigDecimal.ZERO) && MoneyHelper.isMenorIgual(baseCalculoSeguro, BigDecimal.ZERO)) {