diff --git a/build/Ba1.vcxproj b/build/Ba1.vcxproj
index 8a109f65a..3945ab401 100644
--- a/build/Ba1.vcxproj
+++ b/build/Ba1.vcxproj
@@ -13,7 +13,7 @@
{49C74C37-E090-49C1-9097-6F6F63EDC662}
ba1
- 10.0.17763.0
+ 10.0.19041.0
diff --git a/build/Ba1.vcxproj.filters b/build/Ba1.vcxproj.filters
index b8257937a..d3614cfca 100644
--- a/build/Ba1.vcxproj.filters
+++ b/build/Ba1.vcxproj.filters
@@ -1,164 +1,58 @@

-
- {1e1ade46-f4f0-484f-94dd-aa338ab560e1}
- cpp
-
-
- {a89437c6-23f6-413c-8daa-9318a5ce3b05}
- uml
-
-
- {2bbdfa27-e628-4148-8d07-94d054f3924f}
- h
-
-
- {b2347bc8-58e9-493e-ac07-ee9996c4b304}
- frm
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- Sources
-
-
- Sources
-
-
- Sources
-
-
- Sources
-
-
- Sources
-
-
- Sources
-
-
- Sources
-
-
- Sources
-
-
- Sources
-
-
- Sources
-
-
- Sources
-
-
- Sources
-
-
- Sources
-
-
- Sources
-
-
- Sources
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- Headers
-
-
- Headers
-
-
- Headers
-
-
- Headers
-
-
- Headers
-
-
- Headers
-
-
- Headers
-
-
- Headers
-
-
- Headers
-
-
- Headers
-
-
- Headers
-
-
- Headers
-
-
- Headers
-
-
- Headers
-
-
-
-
- Forms
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- Masks
-
-
- Masks
-
-
- Masks
-
-
- Masks
-
-
- Masks
-
-
- Masks
-
-
- Masks
-
-
- Masks
-
-
- Masks
-
-
- Masks
-
-
- Masks
-
-
- Masks
-
-
- Masks
-
- Masks
-
+
diff --git a/build/Ba2.vcxproj b/build/Ba2.vcxproj
index 770805ed1..1c6e0a63c 100644
--- a/build/Ba2.vcxproj
+++ b/build/Ba2.vcxproj
@@ -13,7 +13,7 @@
{BA2E872C-B136-4E66-AC13-F68BC866F3F6}
ba2
- 10.0.17763.0
+ 10.0.19041.0
diff --git a/build/Ba3.vcxproj b/build/Ba3.vcxproj
index c7b9d0b42..114d76618 100644
--- a/build/Ba3.vcxproj
+++ b/build/Ba3.vcxproj
@@ -13,7 +13,7 @@
{FC9EFDA2-0C7E-4E23-A4E9-2FA75FB67A9D}
ba3
- 10.0.17763.0
+ 10.0.19041.0
diff --git a/build/Ba4.vcxproj b/build/Ba4.vcxproj
index b5969882b..a50a33f40 100644
--- a/build/Ba4.vcxproj
+++ b/build/Ba4.vcxproj
@@ -13,7 +13,7 @@
{25720AEB-5522-49EF-95C3-01A2CB94E5AC}
ba4
- 10.0.17763.0
+ 10.0.19041.0
diff --git a/build/Ba5.vcxproj b/build/Ba5.vcxproj
index ab49f7cb8..6ab0c973d 100644
--- a/build/Ba5.vcxproj
+++ b/build/Ba5.vcxproj
@@ -13,7 +13,7 @@
{D221B0AB-8D4C-4781-B496-C3C0641FF13B}
ba5
- 10.0.17763.0
+ 10.0.19041.0
diff --git a/build/Ba6.vcxproj b/build/Ba6.vcxproj
index d9c5baeeb..0c6351084 100644
--- a/build/Ba6.vcxproj
+++ b/build/Ba6.vcxproj
@@ -12,7 +12,7 @@
{E7F9C169-23F8-4140-AEF2-F995149DE295}
- 10.0.17763.0
+ 10.0.19041.0
diff --git a/build/Ba7.vcxproj b/build/Ba7.vcxproj
index 64afa01be..12ec27b94 100644
--- a/build/Ba7.vcxproj
+++ b/build/Ba7.vcxproj
@@ -13,7 +13,7 @@
{F6D2167A-3F9E-42DD-A037-10AF8B5FF03B}
ba7
- 10.0.17763.0
+ 10.0.19041.0
diff --git a/build/Bacnv.vcxproj b/build/Bacnv.vcxproj
index e50956513..d12c864e4 100644
--- a/build/Bacnv.vcxproj
+++ b/build/Bacnv.vcxproj
@@ -13,7 +13,7 @@
{D93637B7-B291-4E77-99E5-7FCFEE2F20C7}
bacnv
- 10.0.17763.0
+ 10.0.19041.0
diff --git a/build/Bainst.vcxproj b/build/Bainst.vcxproj
index f8381ed93..43454906e 100644
--- a/build/Bainst.vcxproj
+++ b/build/Bainst.vcxproj
@@ -13,7 +13,7 @@
{9B892979-53D5-4482-8E46-057C79D3692A}
bainst
- 10.0.17763.0
+ 10.0.19041.0
diff --git a/build/Cacnv.vcxproj b/build/Cacnv.vcxproj
index c74ff85c2..08e1d6780 100644
--- a/build/Cacnv.vcxproj
+++ b/build/Cacnv.vcxproj
@@ -13,7 +13,7 @@
{E91AE948-8929-409C-A253-176D97047DA1}
cacnv
- 10.0.17763.0
+ 10.0.19041.0
diff --git a/build/SSAservice.vcxproj b/build/SSAservice.vcxproj
index 5b4d6446c..f4279f816 100644
--- a/build/SSAservice.vcxproj
+++ b/build/SSAservice.vcxproj
@@ -22,7 +22,7 @@
{DE70E2D1-6A4D-4984-BD82-CE750889F0D3}
CppWindowsService
Win32Proj
- 10.0.17763.0
+ 10.0.19041.0
diff --git a/build/autorun.vcxproj b/build/autorun.vcxproj
index 162a8d1e8..5503279ff 100644
--- a/build/autorun.vcxproj
+++ b/build/autorun.vcxproj
@@ -14,7 +14,7 @@
{D748A0B3-109B-4315-B121-79C09A01E2B0}
Win32Proj
autorun
- 10.0.17763.0
+ 10.0.19041.0
diff --git a/build/ba0.vcxproj b/build/ba0.vcxproj
index 2105378d6..027d40dee 100644
--- a/build/ba0.vcxproj
+++ b/build/ba0.vcxproj
@@ -13,7 +13,7 @@
{C0B02B54-470C-4567-9BF2-6955794A56B6}
ba0
- 10.0.17763.0
+ 10.0.19041.0
diff --git a/build/ba8.vcxproj b/build/ba8.vcxproj
index 92b242a46..a16d25c39 100644
--- a/build/ba8.vcxproj
+++ b/build/ba8.vcxproj
@@ -13,7 +13,7 @@
{142BE81D-36A6-4F3D-8336-DCB028983216}
ba8
- 10.0.17763.0
+ 10.0.19041.0
diff --git a/build/ba9.vcxproj b/build/ba9.vcxproj
index 803c24245..d36c79b06 100644
--- a/build/ba9.vcxproj
+++ b/build/ba9.vcxproj
@@ -13,7 +13,7 @@
{1A66F6D4-F7BF-4363-AB8F-98FEEC920CAA}
ba9
- 10.0.17763.0
+ 10.0.19041.0
diff --git a/build/ba_masktab.vcxproj b/build/ba_masktab.vcxproj
index 6ec5481c8..112ab9ece 100644
--- a/build/ba_masktab.vcxproj
+++ b/build/ba_masktab.vcxproj
@@ -13,7 +13,7 @@
{D53794B2-2BDD-4D8F-BEFF-A65DA01D5B03}
ba_masktab
- 10.0.17763.0
+ 10.0.19041.0
diff --git a/build/ca0.vcxproj b/build/ca0.vcxproj
index fd5d81c72..dc74cc9db 100644
--- a/build/ca0.vcxproj
+++ b/build/ca0.vcxproj
@@ -13,7 +13,7 @@
{5E2A482C-0B8F-4D04-A732-07303504377E}
ca0
- 10.0.17763.0
+ 10.0.19041.0
diff --git a/build/ca0.vcxproj.filters b/build/ca0.vcxproj.filters
index 15c91b328..88dfadb15 100644
--- a/build/ca0.vcxproj.filters
+++ b/build/ca0.vcxproj.filters
@@ -134,76 +134,6 @@
Headers
-
-
- Trr
-
-
- Trr
-
-
- Trr
-
-
- Trr
-
-
- Trr
-
-
- Trr
-
-
- Trr
-
-
- Trr
-
-
- Trr
-
-
- Trr
-
-
- Trr
-
-
-
-
- Dir
-
-
- Dir
-
-
- Dir
-
-
- Dir
-
-
- Dir
-
-
- Dir
-
-
- Dir
-
-
- Dir
-
-
- Dir
-
-
- Dir
-
-
- Dir
-
-
Menus
diff --git a/build/ca1.vcxproj b/build/ca1.vcxproj
index afccafeb5..58ae054f1 100644
--- a/build/ca1.vcxproj
+++ b/build/ca1.vcxproj
@@ -13,7 +13,7 @@
{2EFD079D-A428-4039-9E97-64FF97E91185}
ca1
- 10.0.17763.0
+ 10.0.19041.0
diff --git a/build/ca2.vcxproj b/build/ca2.vcxproj
index 3a06a4459..3bd91581c 100644
--- a/build/ca2.vcxproj
+++ b/build/ca2.vcxproj
@@ -13,7 +13,7 @@
{DD1CD3E9-61BA-4A4D-9746-E8BBB3DA9A92}
ca2
- 10.0.17763.0
+ 10.0.19041.0
diff --git a/build/ca9.vcxproj b/build/ca9.vcxproj
index f52340021..0ff76f667 100644
--- a/build/ca9.vcxproj
+++ b/build/ca9.vcxproj
@@ -13,7 +13,7 @@
{CD2EA338-6283-41FA-AEDB-90B9546927A2}
ca9
- 10.0.17763.0
+ 10.0.19041.0
diff --git a/build/fastrip.vcxproj b/build/fastrip.vcxproj
index e5de56a9a..03e37fc0e 100644
--- a/build/fastrip.vcxproj
+++ b/build/fastrip.vcxproj
@@ -14,7 +14,7 @@
{68251613-3B9A-4F87-9F40-827C46267ADE}
Win32Proj
fastrip
- 10.0.17763.0
+ 10.0.19041.0
diff --git a/build/patchdef.vcxproj b/build/patchdef.vcxproj
index 267478e68..0754a531e 100644
--- a/build/patchdef.vcxproj
+++ b/build/patchdef.vcxproj
@@ -14,7 +14,7 @@
{2DCB2E4A-EFB6-4561-8D87-C5ADBDB76533}
Win32Proj
fastrip
- 10.0.17763.0
+ 10.0.19041.0
diff --git a/build/setup.vcxproj b/build/setup.vcxproj
index d69d3cceb..72490212b 100644
--- a/build/setup.vcxproj
+++ b/build/setup.vcxproj
@@ -15,7 +15,7 @@
Setup
Win32Proj
SetCmpUp
- 10.0.17763.0
+ 10.0.19041.0
diff --git a/cd/test/ba1400.txt b/cd/test/ba1400.txt
new file mode 100644
index 000000000..b14edaea8
--- /dev/null
+++ b/cd/test/ba1400.txt
@@ -0,0 +1,2 @@
+recdesc\f146.trr
+recdesc\f146.dir
diff --git a/cd/test/ba1400a.ini b/cd/test/ba1400a.ini
new file mode 100644
index 000000000..9a5371130
--- /dev/null
+++ b/cd/test/ba1400a.ini
@@ -0,0 +1,31 @@
+[Main]
+Demo=0
+[ba2]
+File(338) = recdesc\f146.dir|X
+File(339) = recdesc\f146.trr|X
+Patch = 1400
+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 = 09-06-2025
+Descrizione = Base
+Dischi = 1
+Moduli = sy
+OEM =
+Patch = 1400
+PostProcess = bainst -0 BA
+PreProcess =
+Prezzo(1) =
+Prezzo(2) =
+Versione = 21511200
+
diff --git a/cd/test/ba1400a1.zip b/cd/test/ba1400a1.zip
new file mode 100644
index 000000000..00947312a
Binary files /dev/null and b/cd/test/ba1400a1.zip differ
diff --git a/cd/test/ca1400.txt b/cd/test/ca1400.txt
new file mode 100644
index 000000000..b06a7bae8
--- /dev/null
+++ b/cd/test/ca1400.txt
@@ -0,0 +1,6 @@
+camenu.men
+ca3a00c.rep
+ca3a00.msk
+ca3.exe
+ca3a00a.rep
+ca3a00b.rep
diff --git a/cd/test/ca1400a.ini b/cd/test/ca1400a.ini
new file mode 100644
index 000000000..291e1e9d6
--- /dev/null
+++ b/cd/test/ca1400a.ini
@@ -0,0 +1,29 @@
+[Main]
+Demo=0
+[ca1]
+File(34) = camenu.men|X
+Patch = 1400
+Versione = 21511200
+
+[ca3]
+File(41) = ca3.exe|X
+File(67) = ca3a00.msk|X
+File(68) = ca3a00a.rep|X
+File(69) = ca3a00b.rep|X
+File(70) = ca3a00c.rep|X
+Patch = 1400
+Versione = 21511200
+
+[ca]
+Data = 13-05-2025
+Descrizione = Contabilita' Analitica
+Dischi = 1
+Moduli = ba,cg
+OEM =
+Patch = 1400
+PostProcess =
+PreProcess =
+Prezzo(1) =
+Prezzo(2) =
+Versione = 21511200
+
diff --git a/cd/test/ca1400a1.zip b/cd/test/ca1400a1.zip
new file mode 100644
index 000000000..0ed7d7c4e
Binary files /dev/null and b/cd/test/ca1400a1.zip differ
diff --git a/src/ca/ca3A00.cpp b/src/ca/ca3A00.cpp
index deea1de71..e0a191398 100644
--- a/src/ca/ca3A00.cpp
+++ b/src/ca/ca3A00.cpp
@@ -225,7 +225,7 @@ void TPrint_prosp_ricerca_ca_recordset::requery()
const TRectype & curr_ivd = cur_ivd.curr();
cur_ivd.freeze();
- for (cur_ivd = 0L; !cur_ivd.eoc(); ++cur_ivd)
+ for (cur_ivd = 0L; cur_ivd.pos() < ivd_items; ++cur_ivd)
{
const TString& codtab = curr_ivd.get("CODTAB");
@@ -357,7 +357,7 @@ void TPrint_prosp_ricerca_ca_recordset::requery()
const int tmp_items = temp.items();
TRectype & temp_rec = temp.curr();
- for (temp = 0L; !temp.eoc(); ++temp)
+ for (temp = 0L; temp.pos() < tmp_items; ++temp)
{
if (!temp_rec.get_bool(PROSP_MOVIM))
temp_rec.remove();
@@ -463,22 +463,23 @@ TAutomask & TPrint_prosp_ricerca_ca::get_mask()
TTrec * TPrint_prosp_ricerca_ca::get_dbase_recdesc(TReport & rep, const TAutomask & mask)
{
- TXmltrec * desc = new TXmltrec;
+ TTrec * desc = new TTrec;
+ TToken_string def;
- desc->add_fielddef(PROSP_LETTERA, _alfafld, 1, 0, "Lettera IV direttiva");
- desc->add_fielddef(PROSP_NUM, _intfld, 2, 0, "Numero arabo IV direttiva");
- desc->add_fielddef(PROSP_SUB, _intfld, 6, 0, "Sub IV direttiva");
- desc->add_fielddef(PROSP_DESCR, _alfafld, 70, 0, "Descrizione");
- desc->add_fielddef(PROSP_NONECON, _realfld, 18, 2, "Attività non economiche");
- desc->add_fielddef(PROSP_ATTREZZ, _realfld, 18, 2, "Locazione attrezzature a imprese");
- desc->add_fielddef(PROSP_SERVIZI, _realfld, 18, 2, "Fornitura di servizi a imprese e prestazioni tariffate");
- desc->add_fielddef(PROSP_CONTR, _realfld, 18, 2, "Contratti di ricerca commissionata");
- desc->add_fielddef(PROSP_TRACON, _realfld, 18, 2, "Trasferimento delle conoscenze");
- desc->add_fielddef(PROSP_ALTRE, _realfld, 18, 2, "Altre attività economiche");
- desc->add_fielddef(PROSP_SERVCOM, _realfld, 18, 2, "Servizi e funzioni comuni");
- desc->add_fielddef(PROSP_NONATTR, _realfld, 18, 2, "Valori non attribuibili");
- desc->add_fielddef(PROSP_TOTALE, _realfld, 18, 2, "Totale riga");
- desc->add_fielddef(PROSP_MOVIM, _boolfld, 1, 0, "Movimentato");
+ desc->add_fielddef(PROSP_LETTERA, _alfafld, 1);
+ desc->add_fielddef(PROSP_NUM, _intfld, 2);
+ desc->add_fielddef(PROSP_SUB, _intfld, 6);
+ desc->add_fielddef(PROSP_DESCR, _alfafld, 70);
+ desc->add_fielddef(PROSP_NONECON, _realfld, 18, 2);
+ desc->add_fielddef(PROSP_ATTREZZ, _realfld, 18, 2);
+ desc->add_fielddef(PROSP_SERVIZI, _realfld, 18, 2);
+ desc->add_fielddef(PROSP_CONTR, _realfld, 18, 2);
+ desc->add_fielddef(PROSP_TRACON, _realfld, 18, 2);
+ desc->add_fielddef(PROSP_ALTRE, _realfld, 18, 2);
+ desc->add_fielddef(PROSP_SERVCOM, _realfld, 18, 2);
+ desc->add_fielddef(PROSP_NONATTR, _realfld, 18, 2);
+ desc->add_fielddef(PROSP_TOTALE, _realfld, 18, 2);
+ desc->add_fielddef(PROSP_MOVIM, _boolfld, 1);
TToken_string keydef(PROSP_LETTERA, '+');