From dcad7799feffb3fd7ce910062355c624eb26e630 Mon Sep 17 00:00:00 2001
From: MinaR <m.ruggiero@integry.it>
Date: Fri, 13 Dec 2024 12:14:20 +0100
Subject: [PATCH] GESTIONE VENTILAZIONE SU PV E PERIODO

---
 .../model/Migration_20241213105213.java       | 25 +++++++++++++++++++
 .../completing/DocOrdCalTotaliRules.java      |  2 +-
 .../contabil/dto/ExportCorrispettiviDTO.java  | 14 +++++------
 .../service/RegCorrispettivoService.java      |  4 +--
 4 files changed, 35 insertions(+), 10 deletions(-)
 create mode 100644 ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241213105213.java

diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241213105213.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241213105213.java
new file mode 100644
index 0000000000..9346e7d2ae
--- /dev/null
+++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241213105213.java
@@ -0,0 +1,25 @@
+package it.integry.ems.migration.model;
+
+import it.integry.ems.migration._base.BaseMigration;
+import it.integry.ems.migration._base.MigrationModelInterface;
+
+public class Migration_20241213105213 extends BaseMigration implements MigrationModelInterface {
+
+    @Override
+    public void up() throws Exception {
+        if (isHistoryDB())
+            return;
+
+        createSetupQuery("COD_PAGA_D", "Codice pagamento", "  SELECT COD_PAGA + '|' + DESCRIZIONE  \n" +
+                "  FROM gtb_paga\n" +
+                "  WHERE flag_attivo = 'S'");
+
+        executeStatement("  UPDATE stb_gest_setup \n" +
+                "  SET query_default = 'COD_PAGA_D'\n" +
+                "  WHERE gest_name = 'VTB_DIST_INCAT' AND section = 'COD_PAGA'");
+    }
+
+    @Override
+    public void down() throws Exception {
+    }
+}
\ No newline at end of file
diff --git a/ems-core/src/main/java/it/integry/ems/rules/completing/DocOrdCalTotaliRules.java b/ems-core/src/main/java/it/integry/ems/rules/completing/DocOrdCalTotaliRules.java
index bcabd3a392..4e01a8ccda 100644
--- a/ems-core/src/main/java/it/integry/ems/rules/completing/DocOrdCalTotaliRules.java
+++ b/ems-core/src/main/java/it/integry/ems/rules/completing/DocOrdCalTotaliRules.java
@@ -602,7 +602,7 @@ public class DocOrdCalTotaliRules extends QueryRules {
                     }
 
                     if (insMovCont && (!"IVA COMPOSTA".equals(UtilityString.streNull(tipoIva)))) {
-                        listaCosti = addCosti(((DtbDocr) row), sconti, listaCosti, ((DtbDoct) testata).getCodJfas());
+                        listaCosti = addCosti(((DtbDocr) row), sconti, listaCosti, testata.getCodJfas());
                     }
 
                     boolean prendiNeiTotali = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(conn, "SELECT dbo.chk_ArtCalcTotali(" + UtilityDB.valueToString(codMart) + ")");
diff --git a/ems-engine/src/main/java/it/integry/ems/contabil/dto/ExportCorrispettiviDTO.java b/ems-engine/src/main/java/it/integry/ems/contabil/dto/ExportCorrispettiviDTO.java
index 42f57f4b16..0337bd0b0e 100644
--- a/ems-engine/src/main/java/it/integry/ems/contabil/dto/ExportCorrispettiviDTO.java
+++ b/ems-engine/src/main/java/it/integry/ems/contabil/dto/ExportCorrispettiviDTO.java
@@ -27,25 +27,25 @@ public class ExportCorrispettiviDTO {
 
     public static class ContiTipiInca {
         @MapToTable("cod_mdep")
-        String codMdep;
+        private String codMdep;
 
         @MapToTable("tipo_inca")
-        String tipoInca;
+        private String tipoInca;
 
         @MapToTable("cod_ccon")
-        String codCcon;
+        private String codCcon;
 
         @MapToTable("descrizione")
-        String descrizione;
+        private String descrizione;
 
         @MapToTable("cod_ccon_storno")
-        String codCconStorno;
+        private String codCconStorno;
 
         @MapToTable("cod_aliq")
-        String codAliq;
+        private String codAliq;
 
         @MapToTable("perc_aliq")
-        BigDecimal percAliq;
+        private BigDecimal percAliq;
 
         public String getCodMdep() {
             return codMdep;
diff --git a/ems-engine/src/main/java/it/integry/ems/contabil/service/RegCorrispettivoService.java b/ems-engine/src/main/java/it/integry/ems/contabil/service/RegCorrispettivoService.java
index 1437ce9045..00fa5cb376 100644
--- a/ems-engine/src/main/java/it/integry/ems/contabil/service/RegCorrispettivoService.java
+++ b/ems-engine/src/main/java/it/integry/ems/contabil/service/RegCorrispettivoService.java
@@ -97,10 +97,10 @@ public class RegCorrispettivoService {
                         "       dtb_doct.num_doc,\n" +
                         "       dtb_doct.tot_imponib + dtb_doct.tot_iva                      AS tot_doc,\n" +
                         "       CAST(CASE\n" +
-                        "                WHEN ctb_ireg.flag_iva_da_ventilare = 'N' THEN 'N'\n" +
+                        "                WHEN ctb_ireg.flag_iva_da_ventilare = 'N' THEN 0\n" +
                         "                ELSE IIF(\n" +
                         "                        dtb_doct.data_reg BETWEEN ISNULL(mtb_depo.data_iniz_vent, dtb_doct.data_reg) AND ISNULL(mtb_depo.data_fine_vent, CAST(GETDATE() AS DATE)),\n" +
-                        "                        'S', 'N') END AS BIT)                              flag_iva_da_ventilare,\n" +
+                        "                        1, 0) END AS BIT)                              flag_iva_da_ventilare,\n" +
                         "       mtb_depo.descrizione,\n" +
                         "       nvw_count_scontrini_doc.count_scontrini,\n" +
                         "       mtb_depo.cod_ccau,\n" +