Merge branch 'R12.00.1244' of http://192.168.2.5:30000/root/campo-sirio into R12.00.1244

cd/test/771384.txt

@@ -0,0 +1 @@
+777.exe

cd/test/771384a.ini

@@ -0,0 +1,26 @@
+[Main]
+Demo=0
+[777]
+File(134) = 777.exe|X
+Patch = 1384
+Versione = 21511200
+
+[7799]
+Kill(0) = batbcaf.msk|x
+Kill(1) = batbca7.msk|x
+Kill(2) = batbent.msk|x
+
+[77]
+Data = 11-03-2025
+Descrizione = Percipienti (Mod.770)
+Dischi = 1
+Edit_4 = 770 -3
+Moduli = ba
+OEM = 
+Patch = 1384
+PostProcess = 
+PreProcess = 
+Prezzo(1) = 
+Prezzo(2) = 
+Versione = 21511200
+

cd/test/ba1384.txt

@@ -0,0 +1,2 @@
+recdesc\f20.dir
+recdesc\f20.trr

cd/test/ba1384a.ini

@@ -0,0 +1,31 @@
+[Main]
+Demo=0
+[ba0]
+File(41) = recdesc\f20.dir|X
+File(42) = recdesc\f20.trr|X
+Patch = 1384
+Versione = 21511200
+
+[ba99]
+Kill(0) = batbsce.txt|x
+Kill(1) = wxmsw240.dll|x
+Kill(2) = bastcms.rep|x
+Kill(3) = bastcms.msk|x
+Kill(4) = bastfsc.msk|x
+Kill(5) = bastfsc.rep|x
+Kill(6) = bastuue.msk|x
+Kill(7) = bastuue.rep|x
+
+[ba]
+Data = 05-03-2025
+Descrizione = Base
+Dischi = 1
+Moduli = sy
+OEM = 
+Patch = 1384
+PostProcess = bainst -0 BA
+PreProcess = 
+Prezzo(1) = 
+Prezzo(2) = 
+Versione = 21511200
+

cd/test/cg1384.txt

@@ -0,0 +1 @@
+cg0200a.msk

cd/test/cg1384a.ini

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

src/cg/cg7400.cpp

@@ -70,7 +70,8 @@ void TQuadro_VA_recordset::load(const char repid)
   if (ditta.get(NDT_DICHP).full())
   {
 		TString16 firmat = prefix().firm().get(NDT_FIRMAT);
-		TToken_string key(prefix().firm().get(NDT_TIPOF));
+	//	TToken_string key(prefix().firm().get(NDT_TIPOF));
+		TToken_string key;
 		
 		if (key.blank())
 			key = "F";