Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Mina Ruggiero
2024-08-08 13:01:12 +02:00
parent 144ea8eaaa 12d6a6dc56
commit fac71baad3
3 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ems-core/pom.xml
View File

@@ -489,7 +489,7 @@
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.10</version>
<version>1.4.20</version>
</dependency>
<!-- log4j -->

1
ems-engine/pom.xml
View File

@@ -66,6 +66,7 @@
<version>3.0.0</version>
<inherited>false</inherited>
<configuration>
<toolchain>jdk</toolchain>
<cleanupDaemonThreads>false</cleanupDaemonThreads>
<mainClass>it.integry.ems_model.rulescompleting.KieStaticCompiler</mainClass>
<skip>false</skip>

25
ems-engine/src/main/java/it/integry/ems/contabil/service/ContabilService.java
View File

@@ -1079,21 +1079,18 @@ public class ContabilService {
if (ctbMovt.getCtbScad() == null ) ctbMovt.setCtbScad(new ArrayList<>());
ctbMovt.getCtbScad().addAll(ctbScadNew);
} else {
CtbParr ctbParr =
new CtbParr()
.setImpAvere(impAvere)
.setImpDare(impDare);
if (chiudiPartita ) {
CtbParr ctbParr =
new CtbParr()
.setImpAvere(impAvere)
.setImpDare(impDare)
.setAnnoPart(UtilityDate.getYear(riga.getDataDoc()))
.setSerDoc(riga.getSerDoc())
.setNumDoc(riga.getNumDoc());
if (chiudiPartita ) {
ctbParr
.setAnnoPart(UtilityDate.getYear(riga.getDataDoc()))
.setSerDoc(riga.getSerDoc())
.setNumDoc(riga.getNumDoc());
}
if (ctbMovr.getCtbParr() == null) ctbMovr.setCtbParr(new ArrayList<>());
ctbMovr.getCtbParr().add(ctbParr);
if (ctbMovr.getCtbParr() == null) ctbMovr.setCtbParr(new ArrayList<>());
ctbMovr.getCtbParr().add(ctbParr);
}
}