Merge branch 'R12.00.1244' of http://10.65.20.33/sirio/CAMPO/campo into R12.00.1244

cd/test/cg1252.txt

@@ -0,0 +1,3 @@
+cg4.exe
+
+Corretta gestione autofatture art.17

cd/test/cg1252a.ini

@@ -0,0 +1,98 @@
+[Main]
+Demo=0
+
+[cg4]
+File(84) = cg4.exe|X
+Patch = 1252
+Versione = 21511200
+
+[cg99]
+Kill(0) = bastcam.msk|x
+Kill(1) = bastver.msk|x
+Kill(2) = batbdpn.msk|x
+Kill(3) = batbndo.msk|x
+Kill(4) = bastvet.rep|x
+Kill(5) = bastreg.rep|x
+Kill(6) = bastivd.rep|x
+Kill(7) = bastesc.msk|x
+Kill(8) = bastleg.rep|x
+Kill(9) = bastivd.msk|x
+Kill(10) = bastdpn.msk|x
+Kill(11) = bastcve.msk|x
+Kill(12) = bastpdb.rep|x
+Kill(13) = batbind.msk|x
+Kill(14) = cgtbcon.msk|x
+Kill(15) = bastesc.rep|x
+Kill(16) = batbleg.msk|x
+Kill(17) = bastzon.rep|x
+Kill(18) = batbarb.msk|x
+Kill(19) = batbpdb.msk|x
+Kill(20) = bastcco.msk|x
+Kill(21) = bastscc.rep|x
+Kill(22) = bastzon.msk|x
+Kill(23) = bastdpn.rep|x
+Kill(24) = batbnot.msk|x
+Kill(25) = bastndo.rep|x
+Kill(26) = bastcve.rep|x
+Kill(27) = batbreg.msk|x
+Kill(28) = batbinl.msk|x
+Kill(29) = bastndo.msk|x
+Kill(30) = batbzon.msk|x
+Kill(31) = batbpor.msk|x
+Kill(32) = batblbu.msk|x
+Kill(33) = bastmsp.rep|x
+Kill(34) = batbcco.msk|x
+Kill(35) = batbcam.msk|x
+Kill(36) = bastscc.msk|x
+Kill(37) = batbcve.msk|x
+Kill(38) = bastpdb.msk|x
+Kill(39) = bastver.rep|x
+Kill(40) = bastmsp.msk|x
+Kill(41) = batbmsp.msk|x
+Kill(42) = bastcam.rep|x
+Kill(43) = batbesc.msk|x
+Kill(44) = bastcfi.rep|x
+Kill(45) = bastpor.msk|x
+Kill(46) = bastcco.rep|x
+Kill(47) = batbtit.msk|x
+Kill(48) = bastcfi.msk|x
+Kill(49) = bastarb.rep|x
+Kill(50) = bastntb.rep|x
+Kill(51) = bastntb.msk|x
+Kill(52) = bastarb.msk|x
+Kill(53) = bastnot.msk|x
+Kill(54) = batbtra.msk|x
+Kill(55) = bastnot.rep|x
+Kill(56) = bastvet.msk|x
+Kill(57) = batbivd.msk|x
+Kill(58) = batbver.msk|x
+Kill(59) = bastleg.msk|x
+Kill(60) = batblia.msk|x
+Kill(61) = batbvet.msk|x
+Kill(62) = batblia.msk|x
+Kill(63) = bastpor.rep|x
+Kill(64) = batbins.msk|x
+Kill(65) = batbdel.msk|x
+Kill(66) = bastreg.msk|x
+Kill(67) = batbcfi.msk|x
+Kill(68) = batbntb.msk|x
+Kill(69) = cg2fppro.msk|x
+Kill(70) = batbscc.msk|x
+
+[cg]
+Data = 28-02-2023
+Descrizione = Contabilita' Generale
+Dischi = 1
+Edit_19 = cg0 -0
+Edit_20 = cg0 -1
+Edit_26 = cg0 -4
+Edit_5 = cg0 -5
+Moduli = ba
+OEM = 
+Patch = 1252
+PostProcess = bainst -0 CG
+PreProcess = 
+Prezzo(1) = 
+Prezzo(2) = 
+Versione = 21511200
+

src/fp/fp0400.cpp

@@ -204,7 +204,7 @@ void TPassive_mask::fill()
 
 	query << "SELECT PZ_TIPOPROT AS TIPO_PROT, YEAR(P7_DATA) AS ANNO, P7_TIPODOC AS [TIPO_SDI], P7_NUMERO AS [NUM_DOC], " <<
 		"P7_DATA AS [DATA_DOC], PZ_DATAORARIC AS [DATA_RIC], PQ_IMPTOTDOC AS [TOT_DOC], PZ_NUMREGCONT AS NUMREGCONT, PZ_DATAREGCONT AS DATAREGCONT, P2_ANADENOMIN AS [RAG_SOC], P2_ANANOME AS NOME, PZ_NUMERO, PZ_DATA, " <<
-		"P2_ANACOGNOME AS COGNOME, P2_FISCIVACOD AS [P_IVA], P2_CODFISCALE AS [COD_FISC], P2_FISCIVAPAESE AS [COD_PAESE], PZ_IDSDI AS[ID_SDI],\n" <<
+		"P2_ANACOGNOME AS COGNOME, P2_FISCIVACOD AS [P_IVA], P2_CODFISCALE AS [COD_FISC], P2_FISCIVAPAESE AS [COD_PAESE], PZ_CODSDI AS[ID_SDI],\n" <<
 		"COUNT(PP_ATTACHMENT) AS ATTACHMENT, P1_CODDEST AS [COD_SDI], PU_PEC AS PEC, P1_KEYPRGINVIO AS KEYPROG, P1_KEYHEADERFATT AS KEYHEAD, P1_KEYBODYFATT AS KEYFATT, " <<
 		"PZ_NUMPROT AS [NUM_PROT], PZ_ANNOPROT AS [ANNO_PROT], PZ_TIPOCF AS [TIPO_CF], PZ_CLIFOR AS [COD_CLIFOR]\n" <<
 		"FROM PAA0100F PAA01\n" <<
@@ -216,7 +216,7 @@ void TPassive_mask::fill()
 		"LEFT JOIN FPPRO00F FPPRO ON P1_KEYPRGINVIO = PZ_KEYPRGINVIO and P1_KEYHEADERFATT = PZ_KEYHEADERFATT and P1_KEYBODYFATT = PZ_KEYBODYFATT\n" <<
 		"WHERE PZ_DATAORARIC >= \'" << dal.date2ansi() << "\' AND PZ_DATAORARIC < \'" << (al+(long)1).date2ansi() << "\'" << prots_query << "\n" <<
 		"GROUP BY YEAR(P7_DATA), P7_TIPODOC, P7_NUMERO, P7_DATA, PZ_DATAORARIC, PQ_IMPTOTDOC, PZ_NUMREGCONT, PZ_DATAREGCONT, P2_ANADENOMIN, P2_ANANOME, P2_ANACOGNOME, P2_FISCIVACOD, P2_CODFISCALE, P2_FISCIVAPAESE,\n" <<
-		"P1_CODDEST, PU_PEC, P1_KEYPRGINVIO, P1_KEYHEADERFATT, P1_KEYBODYFATT, PZ_TIPOPROT, PZ_NUMPROT, PZ_ANNOPROT, PZ_TIPOCF, PZ_CLIFOR, PZ_NUMERO, PZ_DATA, PZ_IDSDI\n" <<
+		"P1_CODDEST, PU_PEC, P1_KEYPRGINVIO, P1_KEYHEADERFATT, P1_KEYBODYFATT, PZ_TIPOPROT, PZ_NUMPROT, PZ_ANNOPROT, PZ_TIPOCF, PZ_CLIFOR, PZ_NUMERO, PZ_DATA, PZ_CODSDI\n" <<
 		"ORDER BY " << (ordin == "D"? "P7_DATA" : "PZ_DATAORARIC") << " " << (verso_ord == "C"? "ASC" : "DESC");
 	fp_db().sq_set_exec(query, false);
 
@@ -436,7 +436,7 @@ TString& TPassive_mask::get_fattsel() const
 void TPassive_mask::auto_assoc()
 {
 	TString query = "SELECT PZ_TIPOPROT AS TIPO_PROT, YEAR(P7_DATA) AS ANNO, P7_TIPODOC AS [TIPO_SDI], P7_NUMERO AS [NUM_DOC],  \n"
-		"P7_DATA AS[DATA_DOC], PZ_DATAORARIC AS[DATA_RIC], PZ_IDSDI AS[ID_SDI], PQ_IMPTOTDOC AS[TOT_DOC], PZ_NUMREGCONT AS NUMREGCONT, PZ_DATAREGCONT AS DATAREGCONT, P2_ANADENOMIN AS[RAG_SOC], P2_ANANOME AS NOME, \n"
+		"P7_DATA AS[DATA_DOC], PZ_DATAORARIC AS[DATA_RIC], PZ_CODSDI AS[ID_SDI], PQ_IMPTOTDOC AS[TOT_DOC], PZ_NUMREGCONT AS NUMREGCONT, PZ_DATAREGCONT AS DATAREGCONT, P2_ANADENOMIN AS[RAG_SOC], P2_ANANOME AS NOME, \n"
 		"P2_ANACOGNOME AS COGNOME, P2_FISCIVACOD AS[P_IVA], P2_CODFISCALE AS[COD_FISC], P2_FISCIVAPAESE AS[COD_PAESE], \n"
 		"COUNT(PP_ATTACHMENT) AS ATTACHMENT, P1_CODDEST AS[COD_SDI], PU_PEC AS PEC, P1_KEYPRGINVIO AS KEYPROG, P1_KEYHEADERFATT AS KEYHEAD, P1_KEYBODYFATT AS KEYFATT, \n"
 		"PZ_NUMPROT AS[NUM_PROT], PZ_ANNOPROT AS[ANNO_PROT], PZ_TIPOCF AS[TIPO_CF], PZ_CLIFOR AS[COD_CLIFOR] \n"

src/fp/sql/fp0124.sql

@@ -1,8 +1,8 @@
 -- ADD PZ_IDSDI
-IF COL_LENGTH('FPPRO00F', 'PZ_IDSDI') IS NOT NULL
+IF COL_LENGTH('FPPRO00F', 'PZ_CODSDI') IS NOT NULL
 	PRINT ('La colonna già esiste')
 ELSE
-	ALTER TABLE FPPRO00F ADD PZ_IDSDI CHAR (20) NOT NULL DEFAULT ''	;
+	ALTER TABLE FPPRO00F ADD PZ_CODSDI CHAR (20) NOT NULL DEFAULT ''	;
 
 -- ADD PZ_PDFALL 
 IF COL_LENGTH('FPPRO00F', 'PZ_PDFALL') IS NOT NULL