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

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

Browse Source
This commit is contained in:
Marco Elefante
2025-07-03 11:17:06 +02:00
parent 88b63564ab b21674f976
commit f4300415af
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ems-engine/src/main/java/it/integry/ems/contabil/export/services/ScadenzeExporterService.java
View File

@@ -75,11 +75,11 @@ public class ScadenzeExporterService {
" INNER JOIN gtb_paga ON ctb_scad.cod_paga = gtb_paga.cod_paga\n" +
" LEFT outer join gtb_tipi_paga on gtb_paga.tipo_paga = gtb_tipi_paga.tipo_paga\n" +
" LEFT OUTER JOIN gtb_tipi_paga_intercode ON gtb_tipi_paga.tipo_paga = gtb_tipi_paga_intercode.tipo_paga AND\n" +
" gtb_tipi_paga_intercode.formato = " + UtilityDB.valueToString(format) +"\n" +
" gtb_tipi_paga_intercode.formato = " + UtilityDB.valueToString(format) + "\n" +
" LEFT OUTER JOIN gtb_banc ON ctb_part.cod_banc = gtb_banc.cod_banc\n" +
" LEFT OUTER JOIN gtb_banc_azi ON gtb_banc.cod_banc = gtb_banc_azi.cod_banc\n" +
" LEFT OUTER JOIN gtb_banc_azi_intercode ON gtb_banc_azi.cod_banc_azi = gtb_banc_azi_intercode.cod_banc_azi AND\n" +
" gtb_banc_azi_intercode.formato = " + UtilityDB.valueToString(format) +"\n" +
" gtb_banc_azi_intercode.formato = " + UtilityDB.valueToString(format) + "\n" +
" LEFT OUTER JOIN vtb_clie ON ctb_part.cod_anag = vtb_clie.cod_anag AND ctb_part.tipo_anag = 'C'\n" +
" LEFT OUTER JOIN atb_forn ON ctb_part.cod_anag = atb_forn.cod_anag AND ctb_part.tipo_anag = 'F'\n" +
" INNER JOIN gtb_divi ON ctb_part.cod_divi = gtb_divi.cod_divi\n" +
@@ -96,7 +96,7 @@ public class ScadenzeExporterService {
" OUTER APPLY (SELECT CASE WHEN (ctb_part.tipo_anag = 'F' AND gtb_tipi_paga.flag_banca_acq = 'A' ) OR (ctb_part.tipo_anag = 'C' AND gtb_tipi_paga.flag_banca_ven = 'A' ) THEN 1 ELSE 0 END as banca_azi ) c\n " +
"WHERE ctb_scad.data_pag IS NULL\n" +
" AND (gtb_anag.part_iva Is null OR gtb_anag.part_iva not in (SELECT part_iva FROM azienda))\n" +
(UtilityString.isNullOrEmpty(codPagaRitAcc)?"":"AND ctb_scad.cod_paga <> " + UtilityDB.valueToString(codPagaRitAcc)) +
(UtilityString.isNullOrEmpty(codPagaRitAcc) ? "" : "AND ctb_scad.cod_paga <> " + UtilityDB.valueToString(codPagaRitAcc)) +
"UNION ALL\n" +
"SELECT 'RD' AS 'tipo_pagamento',\n" +
" (ctb_movr.imp_dare - ctb_movr.imp_avere) AS 'importo',\n" +
@@ -109,7 +109,7 @@ public class ScadenzeExporterService {
" ctb_movt.data_cmov AS 'data_valuta',\n" +
" '' AS 'banca',\n" +
" '' AS 'rbn',\n" +
" 'N' AS 'bloccata',\n" +
" '' AS 'bloccata',\n" +
" IIF(ctb_movr.tipo_anag = 'F', '0201', '0101') AS 'voce',\n" +
" IIF(len(diacod) > 0, diacod, ctb_movr.cod_ccon + ctb_movr.cod_anag) AS 'piano_dei_conti',\n" +
" gtb_anag.rag_soc AS 'descrizione',\n" +