From 615f62467e13b95e53decaeec70674c9c29a0d01 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 6 Nov 2025 16:56:23 +0000 Subject: [PATCH 1/2] Initial plan From 17d98bb78234aa153dd9e09e4cb83db54f949013 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 6 Nov 2025 17:00:58 +0000 Subject: [PATCH 2/2] refactor: use TributacaoIssqn class for ISSQN calculation in IBS/CBS base Co-authored-by: robertorp <10251705+robertorp@users.noreply.github.com> --- .../CalulosDeBC/CalculaBaseCalculoIbsCbs.cs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/MotorTributarioNet/Impostos/CalulosDeBC/CalculaBaseCalculoIbsCbs.cs b/src/MotorTributarioNet/Impostos/CalulosDeBC/CalculaBaseCalculoIbsCbs.cs index 035fd06..32c48e3 100644 --- a/src/MotorTributarioNet/Impostos/CalulosDeBC/CalculaBaseCalculoIbsCbs.cs +++ b/src/MotorTributarioNet/Impostos/CalulosDeBC/CalculaBaseCalculoIbsCbs.cs @@ -141,11 +141,18 @@ private decimal CalcularValorIcms() /// private decimal CalcularValorIssqn() { - // O ISSQN é calculado sobre serviços if (_tributavel.IsServico && _tributavel.PercentualIssqn > 0) { - var baseCalculoIssqn = (_tributavel.ValorProduto * _tributavel.QuantidadeProduto) - _tributavel.Desconto; - return baseCalculoIssqn * _tributavel.PercentualIssqn / 100; + try + { + var tributacaoIssqn = new TributacaoIssqn(_tributavel, _tipoDesconto); + return tributacaoIssqn.Calcula(false).Valor; + } + catch + { + // Em caso de erro no cálculo, retorna 0 para não impactar o cálculo do IBS/CBS + return 0m; + } } return 0m; }