diff --git a/cd/test/ba1016.txt b/cd/test/ba1016.txt
new file mode 100644
index 000000000..408ef432c
--- /dev/null
+++ b/cd/test/ba1016.txt
@@ -0,0 +1,5 @@
+recdesc\f107.trr
+recdesc\f107.dir
+
+Aggiunto il campo contabilità separata nei movimenti di analitica.
+Sostituite le destroy degli sheet con reset_sheet.
\ No newline at end of file
diff --git a/cd/test/ba1016a.ini b/cd/test/ba1016a.ini
new file mode 100644
index 000000000..6a7e229fb
--- /dev/null
+++ b/cd/test/ba1016a.ini
@@ -0,0 +1,32 @@
+[Main]
+Demo=0
+
+[ba0]
+File(134) = recdesc\f107.dir|X
+File(135) = recdesc\f107.trr|X
+Patch = 1016
+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 = 02-12-2020
+Descrizione = Base
+Dischi = 1
+Moduli = sy
+OEM = 
+Patch = 1016
+PostProcess = bainst -0 BA
+PreProcess = 
+Prezzo(1) = 
+Prezzo(2) = 
+Versione = 21511200
+
diff --git a/cd/test/ba1016a1.zip b/cd/test/ba1016a1.zip
new file mode 100644
index 000000000..51cd0683b
Binary files /dev/null and b/cd/test/ba1016a1.zip differ
diff --git a/cd/test/ca1016.txt b/cd/test/ca1016.txt
new file mode 100644
index 000000000..bb85fbcc6
--- /dev/null
+++ b/cd/test/ca1016.txt
@@ -0,0 +1,5 @@
+ca2.exe
+ca2100a.msk
+
+Aggiunto il campo contabilità separata nei movimenti di analitica.
+Sostituite le destroy degli sheet con reset_sheet.
\ No newline at end of file
diff --git a/cd/test/ca1016a.ini b/cd/test/ca1016a.ini
new file mode 100644
index 000000000..588e20ae1
--- /dev/null
+++ b/cd/test/ca1016a.ini
@@ -0,0 +1,23 @@
+[Main]
+Demo=0
+
+[ca2]
+Edit_107 = ca2 -0
+File(30) = ca2.exe|X
+File(31) = ca2100a.msk|X
+Patch = 1016
+Versione = 21511200
+
+[ca]
+Data = 03-02-2020
+Descrizione = Contabilita' Analitica
+Dischi = 1
+Moduli = ba,cg
+OEM = 
+Patch = 1016
+PostProcess = 
+PreProcess = 
+Prezzo(1) = 
+Prezzo(2) = 
+Versione = 21511200
+
diff --git a/cd/test/ca1016a1.zip b/cd/test/ca1016a1.zip
new file mode 100644
index 000000000..872efeb18
Binary files /dev/null and b/cd/test/ca1016a1.zip differ
diff --git a/cd/test/cg1017.txt b/cd/test/cg1017.txt
new file mode 100644
index 000000000..70cc1fae3
--- /dev/null
+++ b/cd/test/cg1017.txt
@@ -0,0 +1,5 @@
+cg2100c.msk
+cg2.exe
+
+Aggiunto il campo contabilità separata nei movimenti di analitica.
+Sostituite le destroy degli sheet con reset_sheet.
\ No newline at end of file
diff --git a/cd/test/cg1017a.ini b/cd/test/cg1017a.ini
new file mode 100644
index 000000000..de9f74ffd
--- /dev/null
+++ b/cd/test/cg1017a.ini
@@ -0,0 +1,99 @@
+[Main]
+Demo=0
+
+[cg2]
+File(51) = cg2.exe|X
+File(54) = cg2100c.msk|X
+Patch = 1017
+Versione = 21511200
+
+[cg99]
+Kill(0) = batbcam.msk|x
+Kill(1) = batbesc.msk|x
+Kill(2) = bastpor.msk|x
+Kill(3) = batblia.msk|x
+Kill(4) = batbvet.msk|x
+Kill(5) = batbins.msk|x
+Kill(6) = batbver.msk|x
+Kill(7) = bastscc.rep|x
+Kill(8) = bastreg.msk|x
+Kill(9) = bastnot.msk|x
+Kill(10) = bastscc.msk|x
+Kill(11) = bastcve.rep|x
+Kill(12) = bastivd.rep|x
+Kill(13) = bastcco.msk|x
+Kill(14) = batbreg.msk|x
+Kill(15) = bastpor.rep|x
+Kill(16) = batbleg.msk|x
+Kill(17) = batbcfi.msk|x
+Kill(18) = bastleg.rep|x
+Kill(19) = batbivd.msk|x
+Kill(20) = batbind.msk|x
+Kill(21) = batbscc.msk|x
+Kill(22) = batbndo.msk|x
+Kill(23) = bastver.msk|x
+Kill(24) = bastivd.msk|x
+Kill(25) = bastcfi.rep|x
+Kill(26) = bastvet.rep|x
+Kill(27) = bastcam.rep|x
+Kill(28) = batbdpn.msk|x
+Kill(29) = bastarb.rep|x
+Kill(30) = bastcam.msk|x
+Kill(31) = batbtit.msk|x
+Kill(32) = batbcco.msk|x
+Kill(33) = bastpdb.rep|x
+Kill(34) = bastmsp.rep|x
+Kill(35) = batbzon.msk|x
+Kill(36) = batbcve.msk|x
+Kill(37) = bastdpn.msk|x
+Kill(38) = bastarb.msk|x
+Kill(39) = bastver.rep|x
+Kill(40) = bastzon.rep|x
+Kill(41) = bastntb.msk|x
+Kill(42) = bastcfi.msk|x
+Kill(43) = bastdpn.rep|x
+Kill(44) = batbdel.msk|x
+Kill(45) = bastzon.msk|x
+Kill(46) = cg2fppro.msk|x
+Kill(47) = bastleg.msk|x
+Kill(48) = batblia.msk|x
+Kill(49) = bastndo.msk|x
+Kill(50) = bastreg.rep|x
+Kill(51) = batbmsp.msk|x
+Kill(52) = batbntb.msk|x
+Kill(53) = bastesc.msk|x
+Kill(54) = cgtbcon.msk|x
+Kill(55) = batbpdb.msk|x
+Kill(56) = bastesc.rep|x
+Kill(57) = bastnot.rep|x
+Kill(58) = batblbu.msk|x
+Kill(59) = batbarb.msk|x
+Kill(60) = batbtra.msk|x
+Kill(61) = bastcco.rep|x
+Kill(62) = batbinl.msk|x
+Kill(63) = bastvet.msk|x
+Kill(64) = bastntb.rep|x
+Kill(65) = bastndo.rep|x
+Kill(66) = batbpor.msk|x
+Kill(67) = bastpdb.msk|x
+Kill(68) = bastmsp.msk|x
+Kill(69) = bastcve.msk|x
+Kill(70) = batbnot.msk|x
+
+[cg]
+Data = 30-11-2020
+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 = 1017
+PostProcess = bainst -0 CG
+PreProcess = 
+Prezzo(1) = 
+Prezzo(2) = 
+Versione = 21511200
+
diff --git a/cd/test/cg1017a1.zip b/cd/test/cg1017a1.zip
new file mode 100644
index 000000000..9290c8392
Binary files /dev/null and b/cd/test/cg1017a1.zip differ
diff --git a/cd/test/ve1016.txt b/cd/test/ve1016.txt
new file mode 100644
index 000000000..01a35e31a
--- /dev/null
+++ b/cd/test/ve1016.txt
@@ -0,0 +1,5 @@
+ve0.exe
+ve6.exe
+
+Aggiunto il campo contabilità separata nei movimenti di analitica.
+Sostituite le destroy degli sheet con reset_sheet.
\ No newline at end of file
diff --git a/cd/test/ve1016a.ini b/cd/test/ve1016a.ini
new file mode 100644
index 000000000..3f28a16af
--- /dev/null
+++ b/cd/test/ve1016a.ini
@@ -0,0 +1,137 @@
+[Main]
+Demo=0
+
+[ve0]
+Edit_163 = ve0 -6
+Edit_4 = ve0 -4
+Edit_5 = ve0 -4
+File(20) = ve0.exe|X
+Patch = 1016
+Versione = 21511200
+
+[ve6]
+File(252) = ve6.exe|X
+Patch = 1016
+Versione = 21511200
+
+[ve99]
+Kill(0) = batbimb.msk|x
+Kill(1) = batbacr.msk|x
+Kill(2) = baststd.rep|x
+Kill(3) = batbeld.msk|x
+Kill(4) = ve7400a.msk|x
+Kill(5) = bastfrd.msk|x
+Kill(6) = bastcaa.rep|x
+Kill(7) = batbcra.msk|x
+Kill(8) = batbfrr.msk|x
+Kill(9) = bastcra.rep|x
+Kill(10) = batbprs.msk|x
+Kill(11) = batbfrm.msk|x
+Kill(12) = bastfca.rep|x
+Kill(13) = batbgmc.msk|x
+Kill(14) = basteld.msk|x
+Kill(15) = bastcra.msk|x
+Kill(16) = bastspp.msk|x
+Kill(17) = basttag.rep|x
+Kill(18) = batbcau.msk|x
+Kill(19) = batbpro.msk|x
+Kill(20) = batbbnp.msk|x
+Kill(21) = bastasf.rep|x
+Kill(22) = bastums.rep|x
+Kill(23) = bastfrr.msk|x
+Kill(24) = basteld.rep|x
+Kill(25) = batbprv.msk|x
+Kill(26) = efstbnp.rep|x
+Kill(27) = ve7500a.msk|x
+Kill(28) = batbgca.msk|x
+Kill(29) = batbubi.msk|x
+Kill(30) = ve7700a.msk|x
+Kill(31) = batbtri.msk|x
+Kill(32) = bastnum.rep|x
+Kill(33) = bastctr.rep|x
+Kill(34) = baststd.msk|x
+Kill(35) = batbasf.msk|x
+Kill(36) = bastimb.msk|x
+Kill(37) = batbrfa.msk|x
+Kill(38) = batbfca.msk|x
+Kill(39) = ve7600a.msk|x
+Kill(40) = batbspt.msk|x
+Kill(41) = ve7200a.frm|x
+Kill(42) = bastrfc.msk|x
+Kill(43) = ve7300a.msk|x
+Kill(44) = bastgcg.msk|x
+Kill(45) = batbspp.msk|x
+Kill(46) = bastcaa.msk|x
+Kill(47) = batbtag.msk|x
+Kill(48) = bastgmc.msk|x
+Kill(49) = batbrfc.msk|x
+Kill(50) = bastubi.msk|x
+Kill(51) = bastcau.rep|x
+Kill(52) = ve7400a.ini|x
+Kill(53) = bastrfa.msk|x
+Kill(54) = bastabe.rep|x
+Kill(55) = bastubi.rep|x
+Kill(56) = bastasf.msk|x
+Kill(57) = batbctr.msk|x
+Kill(58) = ve7100a.msk|x
+Kill(59) = batbcaa.msk|x
+Kill(60) = batbfid.msk|x
+Kill(61) = ve7300a.frm|x
+Kill(62) = bastfrr.rep|x
+Kill(63) = bastums.msk|x
+Kill(64) = basttip.rep|x
+Kill(65) = batbabe.msk|x
+Kill(66) = bastcau.msk|x
+Kill(67) = batbtip.msk|x
+Kill(68) = basttri.rep|x
+Kill(69) = basttag.msk|x
+Kill(70) = bastrfc.rep|x
+Kill(71) = bastimb.rep|x
+Kill(72) = batbfsa.msk|x
+Kill(73) = ve7.exe|x
+Kill(74) = batbnum.msk|x
+Kill(75) = ve7200a.msk|x
+Kill(76) = bastfca.msk|x
+Kill(77) = batbfrd.msk|x
+Kill(78) = bastctr.msk|x
+Kill(79) = bastrfa.rep|x
+Kill(80) = ve7400conf.ini|x
+Kill(81) = bastfrm.rep|x
+Kill(82) = bastprs.msk|x
+Kill(83) = bastgca.rep|x
+Kill(84) = batbstd.msk|x
+Kill(85) = batbmre.msk|x
+Kill(86) = batbgcg.msk|x
+Kill(87) = bastgca.msk|x
+Kill(88) = bastabe.msk|x
+Kill(89) = eftbbnp.msk|x
+Kill(90) = bastprs.rep|x
+Kill(91) = efstbnp.msk|x
+Kill(92) = batbgsa.msk|x
+Kill(93) = bastfrm.msk|x
+Kill(94) = bastbnp.msk|x
+Kill(95) = bastbnp.rep|x
+Kill(96) = basttip.msk|x
+Kill(97) = ve7701a.ini|x
+Kill(98) = bastspp.rep|x
+Kill(99) = batbcld.msk|x
+Kill(100) = basttri.msk|x
+Kill(101) = bastnum.msk|x
+Kill(102) = bastgmc.rep|x
+Kill(103) = batbums.msk|x
+Kill(104) = bastgcg.rep|x
+Kill(105) = bastfrd.rep|x
+
+[ve]
+Data = 25-11-2020
+Descrizione = Vendite
+Dischi = 1
+Moduli = ba,cg9,pr9,mg9,sv9,in9,ef9
+OEM = 
+Patch = 1016
+PostProcess = bainst -0 VE
+PreProcess = 
+Prezzo(1) = 
+Prezzo(2) = 
+Versione = 21511200
+
diff --git a/cd/test/ve1016a1.zip b/cd/test/ve1016a1.zip
new file mode 100644
index 000000000..11b2cde90
Binary files /dev/null and b/cd/test/ve1016a1.zip differ
diff --git a/exe/DIR.GEN b/exe/DIR.GEN
index d75fb8552..05746e618 100644
Binary files a/exe/DIR.GEN and b/exe/DIR.GEN differ
diff --git a/exe/TRC.GEN b/exe/TRC.GEN
index dc57ac4da..cbcb11d31 100644
Binary files a/exe/TRC.GEN and b/exe/TRC.GEN differ
diff --git a/exe/campo.ini b/exe/campo.ini
index d96c8c3ac..ed71b69df 100644
--- a/exe/campo.ini
+++ b/exe/campo.ini
@@ -1,8 +1,8 @@
 [Main]
 Donglehw =4
-Firm =00001a
+Firm =09999a
 MaxHandles = 32
-Study =C:\Users\sirio\Documents\SoftwareSirio\Campo\cortelezzi\
+Study =clienti/major\
 Type = 1
 User = ADMIN
 Temp=c:\temp
diff --git a/exe/install.ini b/exe/install.ini
index 895e5d20a..2e75ecb13 100644
--- a/exe/install.ini
+++ b/exe/install.ini
@@ -26,12 +26,12 @@ Prezzo(2) =
 Versione = 21511200
 
 [ba]
-Data = 25-11-2020
+Data = 02-12-2020
 Descrizione = Base
 Dischi = 1
 Moduli = sy
 OEM =
-Patch = 1014
+Patch = 1016
 PostProcess = bainst -0 BA
 PreProcess =
 Prezzo(1) =
@@ -74,12 +74,12 @@ Edit_20 = cg0 -1
 Edit_26 = cg0 -4
 Edit_5 = cg0 -5
 Moduli = ba
-OEM = 
-Patch = 1016
+OEM =
+Patch = 1017
 PostProcess = bainst -0 CG
-PreProcess = 
-Prezzo(1) = 
-Prezzo(2) = 
+PreProcess =
+Prezzo(1) =
+Prezzo(2) =
 Versione = 21511200
 
 [ca]
@@ -88,7 +88,7 @@ Descrizione = Contabilita' Analitica
 Dischi = 1
 Moduli = ba,cg
 OEM =
-Patch = 998
+Patch = 1016
 PostProcess =
 PreProcess =
 Prezzo(1) =
@@ -233,7 +233,7 @@ Descrizione = Vendite
 Dischi = 1
 Moduli = ba,cg9,pr9,mg9,sv9,in9,ef9
 OEM =
-Patch = 1015
+Patch = 1016
 PostProcess = bainst -0 VE
 PreProcess =
 Prezzo(1) =
@@ -492,87 +492,87 @@ Prezzo(2) =
 Versione = 21511200
 
 [ba99]
-Kill(0) = wxmsw240.dll|x
-Kill(1) = batbsce.txt|x
-Kill(2) = bastfsc.rep|x
-Kill(3) = bastfsc.msk|x
-Kill(4) = bastcms.msk|x
-Kill(5) = bastcms.rep|x
-Kill(6) = bastuue.rep|x
-Kill(7) = bastuue.msk|x
+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
 
 [cg99]
-Kill(0) = bastntb.rep|x
-Kill(1) = bastvet.msk|x
-Kill(2) = bastmsp.msk|x
-Kill(3) = bastpdb.msk|x
-Kill(4) = batbpor.msk|x
-Kill(5) = bastndo.rep|x
-Kill(6) = batbnot.msk|x
-Kill(7) = bastcve.msk|x
-Kill(8) = batbinl.msk|x
-Kill(9) = bastcco.rep|x
-Kill(10) = batbivd.msk|x
-Kill(11) = bastleg.rep|x
-Kill(12) = batbscc.msk|x
-Kill(13) = batbind.msk|x
-Kill(14) = bastivd.rep|x
-Kill(15) = bastscc.msk|x
+Kill(0) = batbcam.msk|x
+Kill(1) = batbesc.msk|x
+Kill(2) = bastpor.msk|x
+Kill(3) = batblia.msk|x
+Kill(4) = batbvet.msk|x
+Kill(5) = batbins.msk|x
+Kill(6) = batbver.msk|x
+Kill(7) = bastscc.rep|x
+Kill(8) = bastreg.msk|x
+Kill(9) = bastnot.msk|x
+Kill(10) = bastscc.msk|x
+Kill(11) = bastcve.rep|x
+Kill(12) = bastivd.rep|x
+Kill(13) = bastcco.msk|x
+Kill(14) = batbreg.msk|x
+Kill(15) = bastpor.rep|x
 Kill(16) = batbleg.msk|x
-Kill(17) = batbreg.msk|x
-Kill(18) = batblia.msk|x
-Kill(19) = batbcam.msk|x
-Kill(20) = bastcco.msk|x
-Kill(21) = bastcve.rep|x
-Kill(22) = batbcfi.msk|x
-Kill(23) = bastpor.rep|x
-Kill(24) = batbvet.msk|x
-Kill(25) = batbesc.msk|x
-Kill(26) = bastreg.msk|x
-Kill(27) = batbver.msk|x
-Kill(28) = batbntb.msk|x
-Kill(29) = bastndo.msk|x
-Kill(30) = batbins.msk|x
-Kill(31) = bastpor.msk|x
-Kill(32) = bastnot.msk|x
-Kill(33) = bastscc.rep|x
-Kill(34) = bastesc.msk|x
-Kill(35) = bastreg.rep|x
-Kill(36) = bastnot.rep|x
-Kill(37) = batbpdb.msk|x
-Kill(38) = bastcfi.msk|x
+Kill(17) = batbcfi.msk|x
+Kill(18) = bastleg.rep|x
+Kill(19) = batbivd.msk|x
+Kill(20) = batbind.msk|x
+Kill(21) = batbscc.msk|x
+Kill(22) = batbndo.msk|x
+Kill(23) = bastver.msk|x
+Kill(24) = bastivd.msk|x
+Kill(25) = bastcfi.rep|x
+Kill(26) = bastvet.rep|x
+Kill(27) = bastcam.rep|x
+Kill(28) = batbdpn.msk|x
+Kill(29) = bastarb.rep|x
+Kill(30) = bastcam.msk|x
+Kill(31) = batbtit.msk|x
+Kill(32) = batbcco.msk|x
+Kill(33) = bastpdb.rep|x
+Kill(34) = bastmsp.rep|x
+Kill(35) = batbzon.msk|x
+Kill(36) = batbcve.msk|x
+Kill(37) = bastdpn.msk|x
+Kill(38) = bastarb.msk|x
 Kill(39) = bastver.rep|x
-Kill(40) = cgtbcon.msk|x
-Kill(41) = batbmsp.msk|x
-Kill(42) = batblbu.msk|x
-Kill(43) = bastesc.rep|x
-Kill(44) = bastdpn.rep|x
-Kill(45) = bastzon.rep|x
-Kill(46) = bastleg.msk|x
-Kill(47) = bastzon.msk|x
-Kill(48) = batbcco.msk|x
-Kill(49) = bastarb.rep|x
-Kill(50) = batbdel.msk|x
-Kill(51) = bastntb.msk|x
-Kill(52) = batblia.msk|x
-Kill(53) = cg2fppro.msk|x
-Kill(54) = bastpdb.rep|x
-Kill(55) = bastcam.msk|x
-Kill(56) = bastdpn.msk|x
-Kill(57) = batbzon.msk|x
-Kill(58) = bastivd.msk|x
-Kill(59) = batbndo.msk|x
-Kill(60) = bastmsp.rep|x
-Kill(61) = batbtit.msk|x
-Kill(62) = bastarb.msk|x
-Kill(63) = batbcve.msk|x
-Kill(64) = bastcfi.rep|x
-Kill(65) = bastver.msk|x
-Kill(66) = batbdpn.msk|x
-Kill(67) = bastcam.rep|x
-Kill(68) = batbtra.msk|x
-Kill(69) = batbarb.msk|x
-Kill(70) = bastvet.rep|x
+Kill(40) = bastzon.rep|x
+Kill(41) = bastntb.msk|x
+Kill(42) = bastcfi.msk|x
+Kill(43) = bastdpn.rep|x
+Kill(44) = batbdel.msk|x
+Kill(45) = bastzon.msk|x
+Kill(46) = cg2fppro.msk|x
+Kill(47) = bastleg.msk|x
+Kill(48) = batblia.msk|x
+Kill(49) = bastndo.msk|x
+Kill(50) = bastreg.rep|x
+Kill(51) = batbmsp.msk|x
+Kill(52) = batbntb.msk|x
+Kill(53) = bastesc.msk|x
+Kill(54) = cgtbcon.msk|x
+Kill(55) = batbpdb.msk|x
+Kill(56) = bastesc.rep|x
+Kill(57) = bastnot.rep|x
+Kill(58) = batblbu.msk|x
+Kill(59) = batbarb.msk|x
+Kill(60) = batbtra.msk|x
+Kill(61) = bastcco.rep|x
+Kill(62) = batbinl.msk|x
+Kill(63) = bastvet.msk|x
+Kill(64) = bastntb.rep|x
+Kill(65) = bastndo.rep|x
+Kill(66) = batbpor.msk|x
+Kill(67) = bastpdb.msk|x
+Kill(68) = bastmsp.msk|x
+Kill(69) = bastcve.msk|x
+Kill(70) = batbnot.msk|x
 
 [7799]
 Kill(0) = batbca7.msk|x
@@ -643,112 +643,112 @@ Patch = 0100
 Versione = 21511200
 
 [ve99]
-Kill(0) = batbcld.msk|x
-Kill(1) = bastspp.rep|x
-Kill(2) = batbums.msk|x
-Kill(3) = bastgmc.rep|x
-Kill(4) = bastnum.msk|x
-Kill(5) = basttri.msk|x
-Kill(6) = bastfrd.rep|x
-Kill(7) = bastgcg.rep|x
-Kill(8) = ve7701a.ini|x
-Kill(9) = basttip.msk|x
-Kill(10) = ve7600a.msk|x
-Kill(11) = batbfca.msk|x
-Kill(12) = ve7200a.frm|x
-Kill(13) = batbspt.msk|x
-Kill(14) = bastnum.rep|x
-Kill(15) = ve7700a.msk|x
-Kill(16) = bastimb.msk|x
-Kill(17) = baststd.msk|x
-Kill(18) = bastfrr.msk|x
-Kill(19) = batbbnp.msk|x
-Kill(20) = bastctr.rep|x
-Kill(21) = batbtri.msk|x
-Kill(22) = batbrfa.msk|x
-Kill(23) = batbasf.msk|x
+Kill(0) = batbimb.msk|x
+Kill(1) = batbacr.msk|x
+Kill(2) = baststd.rep|x
+Kill(3) = batbeld.msk|x
+Kill(4) = ve7400a.msk|x
+Kill(5) = bastfrd.msk|x
+Kill(6) = bastcaa.rep|x
+Kill(7) = batbcra.msk|x
+Kill(8) = batbfrr.msk|x
+Kill(9) = bastcra.rep|x
+Kill(10) = batbprs.msk|x
+Kill(11) = batbfrm.msk|x
+Kill(12) = bastfca.rep|x
+Kill(13) = batbgmc.msk|x
+Kill(14) = basteld.msk|x
+Kill(15) = bastcra.msk|x
+Kill(16) = bastspp.msk|x
+Kill(17) = basttag.rep|x
+Kill(18) = batbcau.msk|x
+Kill(19) = batbpro.msk|x
+Kill(20) = batbbnp.msk|x
+Kill(21) = bastasf.rep|x
+Kill(22) = bastums.rep|x
+Kill(23) = bastfrr.msk|x
 Kill(24) = basteld.rep|x
-Kill(25) = bastasf.rep|x
-Kill(26) = batbgca.msk|x
-Kill(27) = efstbnp.rep|x
-Kill(28) = ve7200a.msk|x
-Kill(29) = batbfsa.msk|x
-Kill(30) = batbprv.msk|x
-Kill(31) = bastums.rep|x
-Kill(32) = batbubi.msk|x
-Kill(33) = ve7500a.msk|x
-Kill(34) = bastfca.msk|x
-Kill(35) = ve7.exe|x
-Kill(36) = ve7400conf.ini|x
-Kill(37) = bastctr.msk|x
-Kill(38) = batbabe.msk|x
-Kill(39) = bastfrr.rep|x
-Kill(40) = batbfrd.msk|x
-Kill(41) = batbnum.msk|x
-Kill(42) = bastfrm.rep|x
-Kill(43) = bastrfa.rep|x
-Kill(44) = bastcau.msk|x
-Kill(45) = bastums.msk|x
-Kill(46) = bastrfc.rep|x
-Kill(47) = basttri.rep|x
-Kill(48) = bastubi.rep|x
-Kill(49) = ve7400a.ini|x
-Kill(50) = batbtip.msk|x
-Kill(51) = basttip.rep|x
-Kill(52) = bastimb.rep|x
-Kill(53) = basttag.msk|x
-Kill(54) = bastasf.msk|x
-Kill(55) = bastrfa.msk|x
-Kill(56) = batbfid.msk|x
-Kill(57) = ve7100a.msk|x
-Kill(58) = batbspp.msk|x
-Kill(59) = bastrfc.msk|x
-Kill(60) = batbctr.msk|x
-Kill(61) = bastabe.rep|x
-Kill(62) = ve7300a.frm|x
-Kill(63) = batbcaa.msk|x
-Kill(64) = bastcaa.msk|x
-Kill(65) = ve7300a.msk|x
-Kill(66) = bastubi.msk|x
-Kill(67) = bastgmc.msk|x
-Kill(68) = batbgcg.msk|x
-Kill(69) = batbstd.msk|x
-Kill(70) = batbtag.msk|x
-Kill(71) = bastgcg.msk|x
-Kill(72) = bastcau.rep|x
-Kill(73) = batbrfc.msk|x
-Kill(74) = bastgca.msk|x
-Kill(75) = batbmre.msk|x
-Kill(76) = eftbbnp.msk|x
-Kill(77) = bastabe.msk|x
-Kill(78) = bastgca.rep|x
-Kill(79) = bastprs.msk|x
-Kill(80) = basttag.rep|x
-Kill(81) = bastspp.msk|x
-Kill(82) = batbpro.msk|x
-Kill(83) = batbcau.msk|x
-Kill(84) = batbprs.msk|x
-Kill(85) = batbfrr.msk|x
-Kill(86) = basteld.msk|x
-Kill(87) = bastfca.rep|x
-Kill(88) = ve7400a.msk|x
-Kill(89) = baststd.rep|x
-Kill(90) = batbfrm.msk|x
-Kill(91) = bastcra.rep|x
-Kill(92) = bastcra.msk|x
-Kill(93) = batbgmc.msk|x
-Kill(94) = bastfrd.msk|x
-Kill(95) = batbeld.msk|x
-Kill(96) = batbcra.msk|x
-Kill(97) = bastcaa.rep|x
-Kill(98) = batbacr.msk|x
-Kill(99) = batbimb.msk|x
-Kill(100) = bastfrm.msk|x
-Kill(101) = batbgsa.msk|x
-Kill(102) = bastbnp.rep|x
-Kill(103) = bastbnp.msk|x
-Kill(104) = efstbnp.msk|x
-Kill(105) = bastprs.rep|x
+Kill(25) = batbprv.msk|x
+Kill(26) = efstbnp.rep|x
+Kill(27) = ve7500a.msk|x
+Kill(28) = batbgca.msk|x
+Kill(29) = batbubi.msk|x
+Kill(30) = ve7700a.msk|x
+Kill(31) = batbtri.msk|x
+Kill(32) = bastnum.rep|x
+Kill(33) = bastctr.rep|x
+Kill(34) = baststd.msk|x
+Kill(35) = batbasf.msk|x
+Kill(36) = bastimb.msk|x
+Kill(37) = batbrfa.msk|x
+Kill(38) = batbfca.msk|x
+Kill(39) = ve7600a.msk|x
+Kill(40) = batbspt.msk|x
+Kill(41) = ve7200a.frm|x
+Kill(42) = bastrfc.msk|x
+Kill(43) = ve7300a.msk|x
+Kill(44) = bastgcg.msk|x
+Kill(45) = batbspp.msk|x
+Kill(46) = bastcaa.msk|x
+Kill(47) = batbtag.msk|x
+Kill(48) = bastgmc.msk|x
+Kill(49) = batbrfc.msk|x
+Kill(50) = bastubi.msk|x
+Kill(51) = bastcau.rep|x
+Kill(52) = ve7400a.ini|x
+Kill(53) = bastrfa.msk|x
+Kill(54) = bastabe.rep|x
+Kill(55) = bastubi.rep|x
+Kill(56) = bastasf.msk|x
+Kill(57) = batbctr.msk|x
+Kill(58) = ve7100a.msk|x
+Kill(59) = batbcaa.msk|x
+Kill(60) = batbfid.msk|x
+Kill(61) = ve7300a.frm|x
+Kill(62) = bastfrr.rep|x
+Kill(63) = bastums.msk|x
+Kill(64) = basttip.rep|x
+Kill(65) = batbabe.msk|x
+Kill(66) = bastcau.msk|x
+Kill(67) = batbtip.msk|x
+Kill(68) = basttri.rep|x
+Kill(69) = basttag.msk|x
+Kill(70) = bastrfc.rep|x
+Kill(71) = bastimb.rep|x
+Kill(72) = batbfsa.msk|x
+Kill(73) = ve7.exe|x
+Kill(74) = batbnum.msk|x
+Kill(75) = ve7200a.msk|x
+Kill(76) = bastfca.msk|x
+Kill(77) = batbfrd.msk|x
+Kill(78) = bastctr.msk|x
+Kill(79) = bastrfa.rep|x
+Kill(80) = ve7400conf.ini|x
+Kill(81) = bastfrm.rep|x
+Kill(82) = bastprs.msk|x
+Kill(83) = bastgca.rep|x
+Kill(84) = batbstd.msk|x
+Kill(85) = batbmre.msk|x
+Kill(86) = batbgcg.msk|x
+Kill(87) = bastgca.msk|x
+Kill(88) = bastabe.msk|x
+Kill(89) = eftbbnp.msk|x
+Kill(90) = bastprs.rep|x
+Kill(91) = efstbnp.msk|x
+Kill(92) = batbgsa.msk|x
+Kill(93) = bastfrm.msk|x
+Kill(94) = bastbnp.msk|x
+Kill(95) = bastbnp.rep|x
+Kill(96) = basttip.msk|x
+Kill(97) = ve7701a.ini|x
+Kill(98) = bastspp.rep|x
+Kill(99) = batbcld.msk|x
+Kill(100) = basttri.msk|x
+Kill(101) = bastnum.msk|x
+Kill(102) = bastgmc.rep|x
+Kill(103) = batbums.msk|x
+Kill(104) = bastgcg.rep|x
+Kill(105) = bastfrd.rep|x
 
 [ef99]
 Kill(0) = eftbbnp.msk|x
@@ -1893,96 +1893,6 @@ File(23) = pr1500a.msk
 Patch = 998
 Versione = 21511200
 
-[ca0]
-Edit_106 = ca0 -3
-Edit_146 = ca0 -4
-Edit_147 = ca0 -5
-Edit_148 = ca0 -6
-Edit_149 = ca0 -7
-File(0) = ca0.exe
-File(1) = ca0300a.msk|X
-File(2) = ca0400a.msk
-File(3) = ca0500a.msk
-File(4) = ca0600a.msk
-File(5) = ca0700a.msk
-File(6) = ca0800a.msk
-File(7) = ca0900a.msk
-File(8) = cacmmenu.men
-File(9) = cacnv.exe
-File(10) = cacnva.msk
-File(11) = camenu.men
-File(12) = catbauc.msk
-File(13) = catbrsp.msk
-File(14) = catbtpc.msk
-File(15) = catbtpl.msk
-Patch = 998
-Versione = 21511200
-
-[ca1]
-File(16) = ca1.exe
-File(17) = ca1100.alx
-File(18) = ca1100a.msk
-File(19) = ca1100a.rep
-File(20) = ca1400a.msk
-File(21) = ca1400a.rep
-File(22) = ca1500a.msk
-File(23) = ca1500a.rep
-File(24) = ca1600a.msk
-File(25) = ca1600a.rep
-File(26) = ca1700a.msk
-File(27) = ca1700a.rep
-File(28) = ca1800a.msk
-File(29) = ca1800a.rep
-Patch = 998
-Versione = 21511200
-
-[ca2]
-Edit_107 = ca2 -0
-File(30) = ca2.exe
-File(31) = ca2100a.msk
-File(32) = ca2200a.msk
-File(33) = ca2300a.msk
-Patch = 998
-Versione = 21511200
-
-[ca3]
-File(34) = ca3.exe
-File(35) = ca3100.msk
-File(36) = ca3100a.rep
-File(37) = ca3100b.rep
-File(38) = ca3200.msk
-File(39) = ca3200a.rep
-File(40) = ca3300.msk
-File(41) = ca3300a.rep
-File(42) = ca3300b.rep
-File(43) = ca3300c.rep
-File(44) = ca3300d.rep
-File(45) = ca3600.msk
-File(46) = ca3600a.rep
-File(47) = ca3700.msk
-File(48) = ca3700a.rep
-File(49) = ca3800.msk
-File(50) = ca3800a.rep
-File(51) = ca3800as.rep
-File(52) = ca3800b.rep
-File(53) = ca3800bs.rep
-File(54) = ca3800c.rep
-File(55) = ca3800cs.rep
-File(56) = ca3900.msk
-File(57) = ca3900a.rep
-Patch = 998
-Versione = 21511200
-
-[ca9]
-File(58) = ca9300a.msk
-File(59) = ca9300a.rep
-File(60) = ca9400k1.msk
-File(61) = ca9400k1.rep
-File(62) = ca9400k2.msk
-File(63) = ca9400k2.rep
-Patch = 998
-Versione = 21511200
-
 [li0]
 File(0) = li0.exe
 File(1) = li0100a.msk
@@ -2139,293 +2049,28 @@ File(54) = xvtdb.dll
 Patch = 1014
 Versione = 21511200
 
-[ve0]
-Edit_163 = ve0 -6
-Edit_4 = ve0 -4
-Edit_5 = ve0 -4
-File(0) = bolacq.ini
-File(1) = bolacq.msk
-File(2) = bollac.ini
-File(3) = bollac.msk
-File(4) = bollaf.ini
-File(5) = bollaf.msk
-File(6) = fatacq.ini
-File(7) = fatacq.msk
-File(8) = fatturaa.ini
-File(9) = fatturaa.msk
-File(10) = fatturac.ini
-File(11) = fatturac.msk
-File(12) = movint.ini
-File(13) = movint.msk
-File(14) = ordbon.ini
-File(15) = ordbon.msk
-File(16) = ordinec.ini
-File(17) = ordinec.msk
-File(18) = ordinef.ini
-File(19) = ordinef.msk
-File(20) = ve0.exe|X
-File(21) = ve0100a.msk
-File(22) = ve0100b.msk
-File(23) = ve0100c.msk
-File(24) = ve0100d.msk
-File(25) = ve0100n.msk
-File(26) = ve0100o.msk
-File(27) = ve0200a.msk
-File(28) = ve0200b.msk
-File(29) = ve0200c.msk
-File(30) = ve0200d.msk
-File(31) = ve0200e.msk
-File(32) = ve0200f.msk
-File(33) = ve0200g.msk
-File(34) = ve0200h.msk
-File(35) = ve0300a.ini
-File(36) = ve0300a__.ini
-File(37) = ve0300b.dat
-File(38) = ve0300c.ini
-File(39) = ve0500a.msk
-Patch = 1015
+[fp0]
+File(0) = fp0.exe
+File(1) = fp0100a.msk|X
+File(2) = fp0200a.msk
+File(3) = fp0300a.msk
+File(4) = fp0400a.msk
+File(5) = fp0500a.msk
+File(6) = fp0600a.msk
+File(7) = fpmenu.men
+File(8) = sql\fp0\fp0108.sql
+File(9) = sql\fp0\fp0112.sql
+File(10) = sql\fp0\fp0114.sql
+File(11) = sql\fp0\fp0116.sql
+File(12) = sql\fp0\fp0118.sql
+Patch = 1013
 Versione = 21511200
 
-[ve1]
-File(40) = ve1.exe|X
-File(41) = ve1000b.msk
-File(42) = ve1100a.msk
-File(43) = ve1100b.msk
-File(44) = ve1200a.frm
-File(45) = ve1200a.msk
-File(46) = ve1300.alx
-File(47) = ve1300a.msk
-File(48) = ve1500.msk
-File(49) = ve1500a.rep
-File(50) = ve1600a.msk
-File(51) = ve1600a.rep
-File(52) = ve17001.rep
-File(53) = ve17002.rep
-File(54) = ve1700a.msk
-File(55) = ve3.exe
-File(56) = ve3100.msk
-File(57) = ve3100d.msk
-File(58) = ve3100i.msk
-File(59) = ve3100r.msk
-File(60) = ve3200.msk
-File(61) = ve3200x.msk
-File(62) = ve3400.msk
-File(63) = ve3500a.msk
-File(64) = ve3500c.rep
-File(65) = ve3500l.rep
-File(66) = ve3500o.rep
-File(67) = ve3800.msk
-File(68) = ve3800a.rep
-File(69) = ve3800b.rep
-File(70) = ve3800c.rep
-File(71) = ve3800d.rep
-File(72) = ve3800e.rep
-File(73) = ve3800f.rep
-File(74) = ve3800g.rep
-File(75) = ve3900a.msk
-File(76) = ve3900a.rep
-File(77) = ve4.exe
-File(78) = ve4100.msk
-File(79) = ve4200a.msk
-File(80) = ve4300a.msk
-File(81) = ve8.exe
-File(82) = ve8100.msk
-File(83) = ve8100a.rep
-File(84) = veacc.frm
-File(85) = veacc.rep
-File(86) = veaccbmp.frm
-File(87) = veaddon.men
-File(88) = vearea.men
-File(89) = vebol.frm
-File(90) = vebol.rep
-File(91) = vebolbmp.frm
-File(92) = vecnford.rep
-File(93) = vefat.frm
-File(94) = vefat.rep
-File(95) = vefatbmp.frm
-File(96) = vefields.txt
-File(97) = vehntip.msk
-File(98) = vehntri.msk
-File(99) = velib04d.msk
-File(100) = velib04e.msk
-File(101) = vemenu.men
-File(102) = verig.msk
-File(103) = verig00.msk
-File(104) = verig01.ini
-File(105) = verig01.msk
-File(106) = verig02.ini
-File(107) = verig02.msk
-File(108) = verig03.ini
-File(109) = verig03.msk
-File(110) = verig04.ini
-File(111) = verig04.msk
-File(112) = verig05.ini
-File(113) = verig05.msk
-File(114) = verig06.ini
-File(115) = verig06.msk
-File(116) = verig07.ini
-File(117) = verig07.msk
-File(118) = verig08.ini
-File(119) = verig08.msk
-File(120) = verig09.ini
-File(121) = verig09.msk
-File(122) = verig10.ini
-File(123) = verig10.msk
-File(124) = verig11.ini
-File(125) = verig11.msk
-File(126) = verig13.ini
-File(127) = verig13.msk
-File(128) = verig14.ini
-File(129) = verig14.msk
-File(130) = verig15.ini
-File(131) = verig15.msk
-File(132) = verig21.ini
-File(133) = verig23.ini
-File(134) = verig23.msk
-File(135) = vestabe.msk
-File(136) = vestabe.rep
-File(137) = vestasf.msk
-File(138) = vestasf.rep
-File(139) = vestatr.msk
-File(140) = vestatr.rep
-File(141) = vestcaa.msk
-File(142) = vestcaa.rep
-File(143) = vestcra.msk
-File(144) = vestcra.rep
-File(145) = vestctr.msk
-File(146) = vestctr.rep
-File(147) = vesteld.msk
-File(148) = vesteld.rep
-File(149) = vestfrd.msk
-File(150) = vestfrd.rep
-File(151) = vestfrm.msk
-File(152) = vestfrm.rep
-File(153) = vestfrr.msk
-File(154) = vestfrr.rep
-File(155) = vestgmc.msk
-File(156) = vestgmc.rep
-File(157) = vestimb.msk
-File(158) = vestimb.rep
-File(159) = vestnum.msk
-File(160) = vestnum.rep
-File(161) = vestprs.msk
-File(162) = vestprs.rep
-File(163) = vestrfa.msk
-File(164) = vestrfa.rep
-File(165) = vestrss.msk
-File(166) = vestrss.rep
-File(167) = vestspp.msk
-File(168) = vestspp.rep
-File(169) = veststd.msk
-File(170) = veststd.rep
-File(171) = vesttag.msk
-File(172) = vesttag.rep
-File(173) = vesttip.msk
-File(174) = vesttip.rep
-File(175) = vesttri.msk
-File(176) = vesttri.rep
-File(177) = vestums.msk
-File(178) = vestums.rep
-File(179) = vetab.txt
-File(180) = vetabcom.txt
-File(181) = vetabmod.txt
-File(182) = vetbabe.msk
-File(183) = vetbasf.msk
-File(184) = vetbatr.msk
-File(185) = vetbcaa.msk
-File(186) = vetbcld.msk
-File(187) = vetbcmt.msk
-File(188) = vetbcra.msk
-File(189) = vetbcsc.msk
-File(190) = vetbctr.msk
-File(191) = vetbcvm.msk
-File(192) = vetbdip.msk
-File(193) = vetbeld.msk
-File(194) = vetbfrd.msk
-File(195) = vetbfrm.msk
-File(196) = vetbfrr.msk
-File(197) = vetbgmc.msk
-File(198) = vetbimb.msk
-File(199) = vetbmre.msk
-File(200) = vetbnar.msk
-File(201) = vetbnum.msk
-File(202) = vetbprs.msk
-File(203) = vetbprv.msk
-File(204) = vetbrfa.msk
-File(205) = vetbric.msk
-File(206) = vetbrpd.msk
-File(207) = vetbrss.msk
-File(208) = vetbscc.msk
-File(209) = vetbspp.msk
-File(210) = vetbstd.msk
-File(211) = vetbstg.msk
-File(212) = vetbtag.msk
-File(213) = vetbtip.msk
-File(214) = vetbtri.msk
-File(215) = vetbums.msk
-Patch = 1015
-Versione = 21511200
-
-[ve2]
-File(216) = ve2.exe
-File(217) = ve2100.msk
-File(218) = ve2100d.msk
-File(219) = ve2100i.msk
-File(220) = ve2100r.msk
-File(221) = ve2200.msk
-File(222) = ve2200c.msk
-File(223) = ve2200x.msk
-File(224) = ve2300.msk
-File(225) = ve2300x.msk
-File(226) = ve2400.msk
-File(227) = ve2400f.msk
-File(228) = ve2400k.msk
-File(229) = ve2500ac.msk
-File(230) = ve2500al.msk
-File(231) = ve2500ao.msk
-File(232) = ve2500as.msk
-File(233) = ve2500ax.msk
-File(234) = ve2500bc.msk
-File(235) = ve2500bl.msk
-File(236) = ve2500bo.msk
-File(237) = ve2500bx.msk
-File(238) = ve2600a.msk
-File(239) = ve2700a.msk
-File(240) = ve2700b.msk
-File(241) = ve2800a.msk
-File(242) = ve2800b.msk
-Patch = 1015
-Versione = 21511200
-
-[ve5]
-File(243) = ve5.exe|X
-File(244) = ve5100a.msk
-File(245) = ve5200.msk
-File(246) = ve5300a.msk
-File(247) = ve5400.msk
-File(248) = ve5500a.msk
-File(249) = ve5600a.msk
-File(250) = ve5700.msk
-File(251) = ve5800a.msk
-Patch = 1015
-Versione = 21511200
-
-[ve6]
-File(252) = ve6.exe|X
-File(253) = ve6100a.msk
-File(254) = ve6200a.msk
-File(255) = ve6300a.msk
-File(256) = ve6400a.msk
-File(257) = ve6500.msk
-File(258) = ve65f734a.app
-File(259) = ve65f734a.pwt
-File(260) = ve6600.ini
-File(261) = ve6700a.msk
-File(262) = ve6800a.msk
-File(263) = ve6900a.msk
-File(264) = ve6b00a.msk
-File(265) = ve6f734a.ini
-Patch = 1015
+[fp1]
+File(13) = fp1.exe
+File(14) = fp1100a.msk
+File(15) = fp1200a.msk
+Patch = 1013
 Versione = 21511200
 
 [ba0]
@@ -2563,8 +2208,8 @@ File(130) = recdesc\f102.dir
 File(131) = recdesc\f102.trr
 File(132) = recdesc\f106.dir
 File(133) = recdesc\f106.trr
-File(134) = recdesc\f107.dir
-File(135) = recdesc\f107.trr
+File(134) = recdesc\f107.dir|X
+File(135) = recdesc\f107.trr|X
 File(136) = recdesc\f108.dir
 File(137) = recdesc\f108.trr
 File(138) = recdesc\f109.dir
@@ -2756,8 +2401,8 @@ File(323) = recdesc\f45.dir
 File(324) = recdesc\f45.trr
 File(325) = recdesc\f46.dir
 File(326) = recdesc\f46.trr
-File(327) = recdesc\f47.dir|X
-File(328) = recdesc\f47.trr|X
+File(327) = recdesc\f47.dir
+File(328) = recdesc\f47.trr
 File(329) = recdesc\f48.dir
 File(330) = recdesc\f48.trr
 File(331) = recdesc\f49.dir
@@ -2842,7 +2487,7 @@ File(409) = recdesc\f99.dir
 File(410) = recdesc\f99.trr
 File(411) = report.alx
 File(412) = studio.ini
-Patch = 1014
+Patch = 1016
 Versione = 21511200
 
 [ba1]
@@ -2864,7 +2509,7 @@ File(427) = recdesc\f181.dir
 File(428) = recdesc\f181.trr
 File(429) = recdesc\f183.dir
 File(430) = recdesc\f183.trr
-Patch = 1014
+Patch = 1016
 Versione = 21511200
 
 [ba2]
@@ -2905,7 +2550,7 @@ File(464) = ba2700a.msk
 File(465) = ba2700b.msk
 File(466) = ba2800a.msk
 File(467) = ba2900a.msk
-Patch = 1014
+Patch = 1016
 Versione = 21511200
 
 [ba3]
@@ -2922,7 +2567,7 @@ File(475) = ba3700a.msk
 File(476) = ba3800a.msk
 File(477) = ba3800b.msk
 File(478) = ba3a00a.msk
-Patch = 1014
+Patch = 1016
 Versione = 21511200
 
 [ba4]
@@ -2936,14 +2581,14 @@ File(484) = ba4400a.msk
 File(485) = ba4500a.msk
 File(486) = ba4600a.msk
 File(487) = ba4700a.msk
-Patch = 1014
+Patch = 1016
 Versione = 21511200
 
 [ba5]
 File(488) = ba5.exe
 File(489) = ba5000.msk
 File(490) = ba5200a.msk
-Patch = 1014
+Patch = 1016
 Versione = 21511200
 
 [ba6]
@@ -2955,7 +2600,7 @@ File(495) = ba6300a.msk
 File(496) = ba63ed.rep
 File(497) = ba63ef.rep
 File(498) = ba63eg.rep
-Patch = 1014
+Patch = 1016
 Versione = 21511200
 
 [ba7]
@@ -2963,7 +2608,7 @@ File(499) = ba7.exe
 File(500) = ba7100a.msk
 File(501) = ba7200a.msk
 File(502) = ba7300a.msk
-Patch = 1014
+Patch = 1016
 Versione = 21511200
 
 [ba8]
@@ -2980,7 +2625,7 @@ File(512) = ba8400a.msk
 File(513) = ba8500a.msk
 File(514) = ba8600a.msk
 File(515) = ba8700a.msk
-Patch = 1014
+Patch = 1016
 Versione = 21511200
 
 [ba9]
@@ -3009,31 +2654,7 @@ File(537) = ba9b00a20.msk
 File(538) = ba9b00a21.msk
 File(539) = ba9b00a22.msk
 File(540) = ba9b00a23.msk
-Patch = 1014
-Versione = 21511200
-
-[fp0]
-File(0) = fp0.exe
-File(1) = fp0100a.msk|X
-File(2) = fp0200a.msk
-File(3) = fp0300a.msk
-File(4) = fp0400a.msk
-File(5) = fp0500a.msk
-File(6) = fp0600a.msk
-File(7) = fpmenu.men
-File(8) = sql\fp0\fp0108.sql
-File(9) = sql\fp0\fp0112.sql
-File(10) = sql\fp0\fp0114.sql
-File(11) = sql\fp0\fp0116.sql
-File(12) = sql\fp0\fp0118.sql
-Patch = 1013
-Versione = 21511200
-
-[fp1]
-File(13) = fp1.exe
-File(14) = fp1100a.msk
-File(15) = fp1200a.msk
-Patch = 1013
+Patch = 1016
 Versione = 21511200
 
 [cg0]
@@ -3046,7 +2667,7 @@ File(5) = cg0500a.msk
 File(6) = cg0700a.msk
 File(7) = cg0800a.msk
 File(8) = cg0800a.rep
-Patch = 1016
+Patch = 1017
 Versione = 21511200
 
 [cg1]
@@ -3092,14 +2713,14 @@ File(47) = cgtblia.msk
 File(48) = cgtbpim.msk
 File(49) = cgtbpimc.msk
 File(50) = cgtbver.msk
-Patch = 1016
+Patch = 1017
 Versione = 21511200
 
 [cg2]
 File(51) = cg2.exe|X
 File(52) = cg2100a.msk
 File(53) = cg2100b.msk
-File(54) = cg2100c.msk
+File(54) = cg2100c.msk|X
 File(55) = cg2100e.msk
 File(56) = cg2100i.msk
 File(57) = cg2100k.msk
@@ -3111,7 +2732,7 @@ File(62) = cg2100t.msk
 File(63) = cg2104a.msk
 File(64) = cg2200a.msk
 File(65) = cg2300a.msk
-Patch = 1016
+Patch = 1017
 Versione = 21511200
 
 [cg3]
@@ -3133,7 +2754,7 @@ File(80) = cg3800a.frm
 File(81) = cg3800a.msk
 File(82) = cg3900a.msk
 File(83) = cg3900a.rep
-Patch = 1016
+Patch = 1017
 Versione = 21511200
 
 [cg4]
@@ -3160,7 +2781,7 @@ File(103) = cg4900f.msk
 File(104) = cg4a00a.msk
 File(105) = cg4b00a.msk
 File(106) = cg4b00a.rep
-Patch = 1016
+Patch = 1017
 Versione = 21511200
 
 [cg5]
@@ -3188,7 +2809,7 @@ File(127) = cg5800b.msk
 File(128) = cg5800b.rep
 File(129) = cg5900a.msk
 File(130) = cg5900a.rep
-Patch = 1016
+Patch = 1017
 Versione = 21511200
 
 [cg7]
@@ -3240,7 +2861,7 @@ File(175) = cg7d00a.png
 File(176) = cg7d00b.png
 File(177) = cg7e00a.png
 File(178) = cg7f00a.png
-Patch = 1016
+Patch = 1017
 Versione = 21511200
 
 [cg8]
@@ -3256,7 +2877,7 @@ File(187) = abstpdb.rep
 File(188) = abtbarb.msk
 File(189) = abtbntb.msk
 File(190) = abtbpdb.msk
-Patch = 1016
+Patch = 1017
 Versione = 21511200
 
 [cg9]
@@ -3338,6 +2959,385 @@ File(265) = cgtbvet.msk
 File(266) = cgtbzon.msk
 File(267) = cgtrc.ini
 File(268) = cgtrcpc.ini
+Patch = 1017
+Versione = 21511200
+
+[ca0]
+Edit_106 = ca0 -3
+Edit_146 = ca0 -4
+Edit_147 = ca0 -5
+Edit_148 = ca0 -6
+Edit_149 = ca0 -7
+File(0) = ca0.exe
+File(1) = ca0300a.msk
+File(2) = ca0400a.msk
+File(3) = ca0500a.msk
+File(4) = ca0600a.msk
+File(5) = ca0700a.msk
+File(6) = ca0800a.msk
+File(7) = ca0900a.msk
+File(8) = cacmmenu.men
+File(9) = cacnv.exe
+File(10) = cacnva.msk
+File(11) = camenu.men
+File(12) = catbauc.msk
+File(13) = catbrsp.msk
+File(14) = catbtpc.msk
+File(15) = catbtpl.msk
+Patch = 1016
+Versione = 21511200
+
+[ca1]
+File(16) = ca1.exe
+File(17) = ca1100.alx
+File(18) = ca1100a.msk
+File(19) = ca1100a.rep
+File(20) = ca1400a.msk
+File(21) = ca1400a.rep
+File(22) = ca1500a.msk
+File(23) = ca1500a.rep
+File(24) = ca1600a.msk
+File(25) = ca1600a.rep
+File(26) = ca1700a.msk
+File(27) = ca1700a.rep
+File(28) = ca1800a.msk
+File(29) = ca1800a.rep
+Patch = 1016
+Versione = 21511200
+
+[ca2]
+Edit_107 = ca2 -0
+File(30) = ca2.exe|X
+File(31) = ca2100a.msk|X
+File(32) = ca2200a.msk
+File(33) = ca2300a.msk
+Patch = 1016
+Versione = 21511200
+
+[ca3]
+File(34) = ca3.exe
+File(35) = ca3100.msk
+File(36) = ca3100a.rep
+File(37) = ca3100b.rep
+File(38) = ca3200.msk
+File(39) = ca3200a.rep
+File(40) = ca3300.msk
+File(41) = ca3300a.rep
+File(42) = ca3300b.rep
+File(43) = ca3300c.rep
+File(44) = ca3300d.rep
+File(45) = ca3600.msk
+File(46) = ca3600a.rep
+File(47) = ca3700.msk
+File(48) = ca3700a.rep
+File(49) = ca3800.msk
+File(50) = ca3800a.rep
+File(51) = ca3800as.rep
+File(52) = ca3800b.rep
+File(53) = ca3800bs.rep
+File(54) = ca3800c.rep
+File(55) = ca3800cs.rep
+File(56) = ca3900.msk
+File(57) = ca3900a.rep
+Patch = 1016
+Versione = 21511200
+
+[ca9]
+File(58) = ca9300a.msk
+File(59) = ca9300a.rep
+File(60) = ca9400k1.msk
+File(61) = ca9400k1.rep
+File(62) = ca9400k2.msk
+File(63) = ca9400k2.rep
+Patch = 1016
+Versione = 21511200
+
+[ve0]
+Edit_163 = ve0 -6
+Edit_4 = ve0 -4
+Edit_5 = ve0 -4
+File(0) = bolacq.ini
+File(1) = bolacq.msk
+File(2) = bollac.ini
+File(3) = bollac.msk
+File(4) = bollaf.ini
+File(5) = bollaf.msk
+File(6) = fatacq.ini
+File(7) = fatacq.msk
+File(8) = fatturaa.ini
+File(9) = fatturaa.msk
+File(10) = fatturac.ini
+File(11) = fatturac.msk
+File(12) = movint.ini
+File(13) = movint.msk
+File(14) = ordbon.ini
+File(15) = ordbon.msk
+File(16) = ordinec.ini
+File(17) = ordinec.msk
+File(18) = ordinef.ini
+File(19) = ordinef.msk
+File(20) = ve0.exe|X
+File(21) = ve0100a.msk
+File(22) = ve0100b.msk
+File(23) = ve0100c.msk
+File(24) = ve0100d.msk
+File(25) = ve0100n.msk
+File(26) = ve0100o.msk
+File(27) = ve0200a.msk
+File(28) = ve0200b.msk
+File(29) = ve0200c.msk
+File(30) = ve0200d.msk
+File(31) = ve0200e.msk
+File(32) = ve0200f.msk
+File(33) = ve0200g.msk
+File(34) = ve0200h.msk
+File(35) = ve0300a.ini
+File(36) = ve0300a__.ini
+File(37) = ve0300b.dat
+File(38) = ve0300c.ini
+File(39) = ve0500a.msk
+Patch = 1016
+Versione = 21511200
+
+[ve1]
+File(40) = ve1.exe
+File(41) = ve1000b.msk
+File(42) = ve1100a.msk
+File(43) = ve1100b.msk
+File(44) = ve1200a.frm
+File(45) = ve1200a.msk
+File(46) = ve1300.alx
+File(47) = ve1300a.msk
+File(48) = ve1500.msk
+File(49) = ve1500a.rep
+File(50) = ve1600a.msk
+File(51) = ve1600a.rep
+File(52) = ve17001.rep
+File(53) = ve17002.rep
+File(54) = ve1700a.msk
+File(55) = ve3.exe
+File(56) = ve3100.msk
+File(57) = ve3100d.msk
+File(58) = ve3100i.msk
+File(59) = ve3100r.msk
+File(60) = ve3200.msk
+File(61) = ve3200x.msk
+File(62) = ve3400.msk
+File(63) = ve3500a.msk
+File(64) = ve3500c.rep
+File(65) = ve3500l.rep
+File(66) = ve3500o.rep
+File(67) = ve3800.msk
+File(68) = ve3800a.rep
+File(69) = ve3800b.rep
+File(70) = ve3800c.rep
+File(71) = ve3800d.rep
+File(72) = ve3800e.rep
+File(73) = ve3800f.rep
+File(74) = ve3800g.rep
+File(75) = ve3900a.msk
+File(76) = ve3900a.rep
+File(77) = ve4.exe
+File(78) = ve4100.msk
+File(79) = ve4200a.msk
+File(80) = ve4300a.msk
+File(81) = ve8.exe
+File(82) = ve8100.msk
+File(83) = ve8100a.rep
+File(84) = veacc.frm
+File(85) = veacc.rep
+File(86) = veaccbmp.frm
+File(87) = veaddon.men
+File(88) = vearea.men
+File(89) = vebol.frm
+File(90) = vebol.rep
+File(91) = vebolbmp.frm
+File(92) = vecnford.rep
+File(93) = vefat.frm
+File(94) = vefat.rep
+File(95) = vefatbmp.frm
+File(96) = vefields.txt
+File(97) = vehntip.msk
+File(98) = vehntri.msk
+File(99) = velib04d.msk
+File(100) = velib04e.msk
+File(101) = vemenu.men
+File(102) = verig.msk
+File(103) = verig00.msk
+File(104) = verig01.ini
+File(105) = verig01.msk
+File(106) = verig02.ini
+File(107) = verig02.msk
+File(108) = verig03.ini
+File(109) = verig03.msk
+File(110) = verig04.ini
+File(111) = verig04.msk
+File(112) = verig05.ini
+File(113) = verig05.msk
+File(114) = verig06.ini
+File(115) = verig06.msk
+File(116) = verig07.ini
+File(117) = verig07.msk
+File(118) = verig08.ini
+File(119) = verig08.msk
+File(120) = verig09.ini
+File(121) = verig09.msk
+File(122) = verig10.ini
+File(123) = verig10.msk
+File(124) = verig11.ini
+File(125) = verig11.msk
+File(126) = verig13.ini
+File(127) = verig13.msk
+File(128) = verig14.ini
+File(129) = verig14.msk
+File(130) = verig15.ini
+File(131) = verig15.msk
+File(132) = verig21.ini
+File(133) = verig23.ini
+File(134) = verig23.msk
+File(135) = vestabe.msk
+File(136) = vestabe.rep
+File(137) = vestasf.msk
+File(138) = vestasf.rep
+File(139) = vestatr.msk
+File(140) = vestatr.rep
+File(141) = vestcaa.msk
+File(142) = vestcaa.rep
+File(143) = vestcra.msk
+File(144) = vestcra.rep
+File(145) = vestctr.msk
+File(146) = vestctr.rep
+File(147) = vesteld.msk
+File(148) = vesteld.rep
+File(149) = vestfrd.msk
+File(150) = vestfrd.rep
+File(151) = vestfrm.msk
+File(152) = vestfrm.rep
+File(153) = vestfrr.msk
+File(154) = vestfrr.rep
+File(155) = vestgmc.msk
+File(156) = vestgmc.rep
+File(157) = vestimb.msk
+File(158) = vestimb.rep
+File(159) = vestnum.msk
+File(160) = vestnum.rep
+File(161) = vestprs.msk
+File(162) = vestprs.rep
+File(163) = vestrfa.msk
+File(164) = vestrfa.rep
+File(165) = vestrss.msk
+File(166) = vestrss.rep
+File(167) = vestspp.msk
+File(168) = vestspp.rep
+File(169) = veststd.msk
+File(170) = veststd.rep
+File(171) = vesttag.msk
+File(172) = vesttag.rep
+File(173) = vesttip.msk
+File(174) = vesttip.rep
+File(175) = vesttri.msk
+File(176) = vesttri.rep
+File(177) = vestums.msk
+File(178) = vestums.rep
+File(179) = vetab.txt
+File(180) = vetabcom.txt
+File(181) = vetabmod.txt
+File(182) = vetbabe.msk
+File(183) = vetbasf.msk
+File(184) = vetbatr.msk
+File(185) = vetbcaa.msk
+File(186) = vetbcld.msk
+File(187) = vetbcmt.msk
+File(188) = vetbcra.msk
+File(189) = vetbcsc.msk
+File(190) = vetbctr.msk
+File(191) = vetbcvm.msk
+File(192) = vetbdip.msk
+File(193) = vetbeld.msk
+File(194) = vetbfrd.msk
+File(195) = vetbfrm.msk
+File(196) = vetbfrr.msk
+File(197) = vetbgmc.msk
+File(198) = vetbimb.msk
+File(199) = vetbmre.msk
+File(200) = vetbnar.msk
+File(201) = vetbnum.msk
+File(202) = vetbprs.msk
+File(203) = vetbprv.msk
+File(204) = vetbrfa.msk
+File(205) = vetbric.msk
+File(206) = vetbrpd.msk
+File(207) = vetbrss.msk
+File(208) = vetbscc.msk
+File(209) = vetbspp.msk
+File(210) = vetbstd.msk
+File(211) = vetbstg.msk
+File(212) = vetbtag.msk
+File(213) = vetbtip.msk
+File(214) = vetbtri.msk
+File(215) = vetbums.msk
+Patch = 1016
+Versione = 21511200
+
+[ve2]
+File(216) = ve2.exe
+File(217) = ve2100.msk
+File(218) = ve2100d.msk
+File(219) = ve2100i.msk
+File(220) = ve2100r.msk
+File(221) = ve2200.msk
+File(222) = ve2200c.msk
+File(223) = ve2200x.msk
+File(224) = ve2300.msk
+File(225) = ve2300x.msk
+File(226) = ve2400.msk
+File(227) = ve2400f.msk
+File(228) = ve2400k.msk
+File(229) = ve2500ac.msk
+File(230) = ve2500al.msk
+File(231) = ve2500ao.msk
+File(232) = ve2500as.msk
+File(233) = ve2500ax.msk
+File(234) = ve2500bc.msk
+File(235) = ve2500bl.msk
+File(236) = ve2500bo.msk
+File(237) = ve2500bx.msk
+File(238) = ve2600a.msk
+File(239) = ve2700a.msk
+File(240) = ve2700b.msk
+File(241) = ve2800a.msk
+File(242) = ve2800b.msk
+Patch = 1016
+Versione = 21511200
+
+[ve5]
+File(243) = ve5.exe
+File(244) = ve5100a.msk
+File(245) = ve5200.msk
+File(246) = ve5300a.msk
+File(247) = ve5400.msk
+File(248) = ve5500a.msk
+File(249) = ve5600a.msk
+File(250) = ve5700.msk
+File(251) = ve5800a.msk
+Patch = 1016
+Versione = 21511200
+
+[ve6]
+File(252) = ve6.exe|X
+File(253) = ve6100a.msk
+File(254) = ve6200a.msk
+File(255) = ve6300a.msk
+File(256) = ve6400a.msk
+File(257) = ve6500.msk
+File(258) = ve65f734a.app
+File(259) = ve65f734a.pwt
+File(260) = ve6600.ini
+File(261) = ve6700a.msk
+File(262) = ve6800a.msk
+File(263) = ve6900a.msk
+File(264) = ve6b00a.msk
+File(265) = ve6f734a.ini
 Patch = 1016
 Versione = 21511200
 
diff --git a/exe/recdesc/d107.des b/exe/recdesc/d107.des
index bc73aff13..0b29628a4 100644
--- a/exe/recdesc/d107.des
+++ b/exe/recdesc/d107.des
@@ -5,6 +5,7 @@ BLOCCATO = Movimento bloccato
 CAMBIO = Cambio della valuta
 CODCAUS = Codice causale contabile
 CODVAL = Codice valuta
+CONTSEP = Contabilità separata
 DANNO = Documento originale ANNO
 DATACAM = Data del cambio
 DATACOMP = Data competenza
diff --git a/exe/recdesc/f107.dir b/exe/recdesc/f107.dir
index 705111b8f..33dfe1681 100644
--- a/exe/recdesc/f107.dir
+++ b/exe/recdesc/f107.dir
@@ -1,3 +1,3 @@
 107
 0
-$movana|0|0|178|0|Movimenti di Analitica|||
+$movana|0|0|184|0|Movimenti di Analitica|||
diff --git a/exe/recdesc/f107.trr b/exe/recdesc/f107.trr
index 9f34ffa9d..bd3387c08 100644
--- a/exe/recdesc/f107.trr
+++ b/exe/recdesc/f107.trr
@@ -1,5 +1,5 @@
 107
-24
+25
 ANNOES|9|4|0|Codice esercizio
 NUMREG|3|7|0|Numero di operazione
 DATAREG|5|8|0|Data operazione
@@ -24,6 +24,7 @@ DNDOC|3|7|0|Documento originale NDOC
 DATAFCOMP|5|8|0|Data finale competenza (solo Preventivi e Variazioni)
 AUTOFCOMP|8|1|0|Data fine competenza calcolata in base a fine commessa
 TRASFERITO|8|1|0|Movimento trasferito dalla Contabilità Generale
+CONTSEP|1|6|0|Contabilità separata
 3
 NUMREG| 
 DATACOMP+NUMREG|X
diff --git a/exe/xvaga.dll b/exe/xvaga.dll
index 1a72bbf0e..8c3b27bfa 100644
Binary files a/exe/xvaga.dll and b/exe/xvaga.dll differ
diff --git a/src/cg/cg2100.cpp b/src/cg/cg2100.cpp
index 8d88dca9c..d0e0d9e36 100755
--- a/src/cg/cg2100.cpp
+++ b/src/cg/cg2100.cpp
@@ -999,7 +999,7 @@ void TPrimanota_application::init_insert_mode(TMask& m)
 
 void TPrimanota_application::f1_init_modify(TMask& m, const TRectype& mov)
 {
-	const bool after_data_inizio_fe = mov.get_date(MOV_DATADOC) >= get_data_start_fatt();
+	const bool after_data_inizio_fe = mov.get_date(MOV_DATADOC) >= fp_settings().get_data_start_fatt();
 
 	if (m.find_by_id(F_COLFPPRO) != nullptr && after_data_inizio_fe)
 		m.set(F_COLFPPRO, mov.get(MOV_KEYFPPRO).empty() ? " " : "X");
diff --git a/src/cg/cg2102.cpp b/src/cg/cg2102.cpp
index 6fefc52c7..9e8baca6f 100755
--- a/src/cg/cg2102.cpp
+++ b/src/cg/cg2102.cpp
@@ -2226,7 +2226,7 @@ bool TPrimanota_application::caus_query_handler(TMask_field& f, KEY key)
 
 void TPrimanota_application::check_fppro_fields(TMask& m)
 {
-	const bool after_data = m.get_date(F_DATAREG) >= get_data_start_fatt();
+	const bool after_data = m.get_date(F_DATAREG) >= fp_settings().get_data_start_fatt();
 	
 	if (!check_causale(m.get(F_CODCAUS)) || !app().has_module(FPAUT) || !after_data)
 	{
diff --git a/src/ve/velib02.cpp b/src/ve/velib02.cpp
index ea0240217..603fefc10 100755
--- a/src/ve/velib02.cpp
+++ b/src/ve/velib02.cpp
@@ -1862,7 +1862,7 @@ const bool TRiga_documento::get_property_bool(const char * paragraph, const char
 
 const int TRiga_documento::get_property_int(const char * paragraph, const char * property_name, int defval, int idx) const
 {
-  int i = get_property_int(paragraph, property_name, defval, idx);
+  int i = tipo().get_property_int(paragraph, property_name, defval, idx);
 
   if (i == defval)
     i = doc().tipo().get_property_int(paragraph, property_name, defval);