Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good

This commit is contained in:
2025-01-10 12:23:27 +01:00

View File

@@ -1290,6 +1290,7 @@ public class DocOrdCalTotaliRules extends QueryRules {
(!UtilityString.isNullOrEmpty(testata.getCodPaga()) || !UtilityString.isNullOrEmpty(costoEsenzione) || !UtilityString.isNullOrEmpty(testata.getCodVvet()))) {
maxRigaSpesa = addAltreSpese(connection, testata, castelletto, speseCalc, maxRigaSpesa, whereCondExcSpese, cifreDec, ventilazione, flagPrzIva);
if ( maxRigaSpesa > 0)
calcTotImponib(testata, connection, flagPrzIva, castelletto, cifreDec);
}
@@ -1307,7 +1308,8 @@ public class DocOrdCalTotaliRules extends QueryRules {
totDoc = totDoc.add(iva.getImponibile().add(iva.getImposta()));
}
if (totDoc.compareTo(BigDecimal.ZERO) != 0) {
addImpostaBollo(connection, testata, castelletto, speseCalc, maxRigaSpesa, whereCondExcSpese, totDoc, ventilazione);
maxRigaSpesa = addImpostaBollo(connection, testata, castelletto, speseCalc, maxRigaSpesa, whereCondExcSpese, totDoc, ventilazione);
if (maxRigaSpesa > 0)
calcTotImponib(testata, connection, flagPrzIva, castelletto, cifreDec);
}
}