diff --git a/build/Cg7.vcxproj b/build/Cg7.vcxproj
index 805156b42..381de6c8a 100644
--- a/build/Cg7.vcxproj
+++ b/build/Cg7.vcxproj
@@ -156,7 +156,8 @@
       <OutputFile>$(IntDir)$(TargetName).xml</OutputFile>
     </Xdcmake>
     <PostBuildEvent>
-      <Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /t http://timestamp.verisign.com/scripts/timstamp.dll /v "$(TargetPath)"</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/build/pa.sln b/build/pa.sln
index 8593ca4c9..3556c6daa 100644
--- a/build/pa.sln
+++ b/build/pa.sln
@@ -1,6 +1,8 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.757
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pa0", "pa0.vcxproj", "{9C91BACF-9A70-4973-B8CC-FA3D2AF9867C}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", "{2D38A763-3D74-4338-9362-B891784EC90E}"
@@ -9,6 +11,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc", "vedoc.vcxproj", "{
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedocext", "vedocext.vcxproj", "{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cglib", "cglib.vcxproj", "{7B80F974-CE2E-4BD9-855A-44FF139FF288}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -31,8 +35,15 @@ Global
 		{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Debug|Win32.Build.0 = Debug|Win32
 		{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.ActiveCfg = Release|Win32
 		{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.Build.0 = Release|Win32
+		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.Build.0 = Debug|Win32
+		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.ActiveCfg = Release|Win32
+		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {787617A4-0BFF-402D-94BE-A70C7F7741C6}
+	EndGlobalSection
 EndGlobal
diff --git a/build/pa0.vcxproj b/build/pa0.vcxproj
index 26f0dc5e9..557f51473 100644
--- a/build/pa0.vcxproj
+++ b/build/pa0.vcxproj
@@ -68,7 +68,6 @@
       <PreprocessorDefinitions>_DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -140,7 +139,8 @@
       <OutputFile>.\..\release/pa0.bsc</OutputFile>
     </Bscmake>
     <PostBuildEvent>
-      <Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /t http://timestamp.verisign.com/scripts/timstamp.dll /v "$(TargetPath)"</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -191,6 +191,9 @@
     <ProjectReference Include="AgaLib.vcxproj">
       <Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
     </ProjectReference>
+    <ProjectReference Include="cglib.vcxproj">
+      <Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
+    </ProjectReference>
     <ProjectReference Include="vedoc.vcxproj">
       <Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
     </ProjectReference>
diff --git a/cd/test/cg1058.txt b/cd/test/cg1058.txt
new file mode 100644
index 000000000..899146e1b
--- /dev/null
+++ b/cd/test/cg1058.txt
@@ -0,0 +1,10 @@
+cg0100a.msk
+cg2100c.msk
+cg7600o.rep
+cg7.exe
+cg7600a.rep
+cg7700b.rep
+cg7700a.rep
+
+Aggiunto tipo costo ricavo per acquisti di materie prime al piano dei conti e alla prima nota
+Modelli IVA 2021
diff --git a/cd/test/cg1058a.ini b/cd/test/cg1058a.ini
new file mode 100644
index 000000000..2b1ffd60d
--- /dev/null
+++ b/cd/test/cg1058a.ini
@@ -0,0 +1,112 @@
+[Main]
+Demo=0
+
+[cg0]
+File(1) = cg0100a.msk|X
+Patch = 1058
+Versione = 21511200
+
+[cg2]
+File(54) = cg2100c.msk|X
+Patch = 1058
+Versione = 21511200
+
+[cg7]
+File(131) = cg7.exe|X
+File(148) = cg7600a.rep|X
+File(162) = cg7700a.rep|X
+File(164) = cg7700b.rep|X
+File(278) = cg7600o.rep|X
+Patch = 1058
+Versione = 21511200
+
+[cg99]
+Kill(0) = batbivd.msk|x
+Kill(1) = bastcfi.rep|x
+Kill(2) = bastleg.rep|x
+Kill(3) = batbtit.msk|x
+Kill(4) = bastscc.rep|x
+Kill(5) = bastcam.msk|x
+Kill(6) = batbtra.msk|x
+Kill(7) = batblbu.msk|x
+Kill(8) = cg2fppro.msk|x
+Kill(9) = bastivd.rep|x
+Kill(10) = bastpor.rep|x
+Kill(11) = bastnot.msk|x
+Kill(12) = batblia.msk|x
+Kill(13) = bastcco.msk|x
+Kill(14) = batbntb.msk|x
+Kill(15) = bastver.msk|x
+Kill(16) = batbleg.msk|x
+Kill(17) = batbdpn.msk|x
+Kill(18) = bastcco.rep|x
+Kill(19) = bastscc.msk|x
+Kill(20) = batbind.msk|x
+Kill(21) = batbcco.msk|x
+Kill(22) = batbpor.msk|x
+Kill(23) = bastndo.rep|x
+Kill(24) = bastpdb.rep|x
+Kill(25) = bastntb.rep|x
+Kill(26) = bastesc.msk|x
+Kill(27) = bastmsp.msk|x
+Kill(28) = batbarb.msk|x
+Kill(29) = bastarb.rep|x
+Kill(30) = batbpdb.msk|x
+Kill(31) = bastcve.rep|x
+Kill(32) = batbreg.msk|x
+Kill(33) = bastcfi.msk|x
+Kill(34) = bastcam.rep|x
+Kill(35) = bastnot.rep|x
+Kill(36) = bastvet.msk|x
+Kill(37) = bastesc.rep|x
+Kill(38) = bastzon.msk|x
+Kill(39) = bastver.rep|x
+Kill(40) = batbinl.msk|x
+Kill(41) = bastntb.msk|x
+Kill(42) = bastzon.rep|x
+Kill(43) = batbdel.msk|x
+Kill(44) = bastreg.rep|x
+Kill(45) = bastreg.msk|x
+Kill(46) = batbnot.msk|x
+Kill(47) = bastvet.rep|x
+Kill(48) = batbcfi.msk|x
+Kill(49) = bastndo.msk|x
+Kill(50) = batbzon.msk|x
+Kill(51) = batbmsp.msk|x
+Kill(52) = batbndo.msk|x
+Kill(53) = batbver.msk|x
+Kill(54) = bastarb.msk|x
+Kill(55) = bastdpn.msk|x
+Kill(56) = bastdpn.rep|x
+Kill(57) = batbcve.msk|x
+Kill(58) = cgtbcon.msk|x
+Kill(59) = batbvet.msk|x
+Kill(60) = bastpdb.msk|x
+Kill(61) = batbscc.msk|x
+Kill(62) = bastleg.msk|x
+Kill(63) = batbesc.msk|x
+Kill(64) = batbcam.msk|x
+Kill(65) = batbins.msk|x
+Kill(66) = bastcve.msk|x
+Kill(67) = bastpor.msk|x
+Kill(68) = batblia.msk|x
+Kill(69) = bastivd.msk|x
+Kill(70) = bastmsp.rep|x
+
+[cg]
+Data = 16-04-2021
+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 = 1058
+PostProcess = bainst -0 CG
+PreProcess = 
+Prezzo(1) = 
+Prezzo(2) = 
+Versione = 21511200
+
diff --git a/cd/test/cg1058a1.zip b/cd/test/cg1058a1.zip
new file mode 100644
index 000000000..edefae165
Binary files /dev/null and b/cd/test/cg1058a1.zip differ
diff --git a/cd/test/tf1058.txt b/cd/test/tf1058.txt
new file mode 100644
index 000000000..1a8270abb
--- /dev/null
+++ b/cd/test/tf1058.txt
@@ -0,0 +1,5 @@
+tf0300a.msk
+tf0.exe
+
+Eliminato il controllo sui nuovi tipi documenti e nature
+
diff --git a/cd/test/tf1058a.ini b/cd/test/tf1058a.ini
new file mode 100644
index 000000000..86e039653
--- /dev/null
+++ b/cd/test/tf1058a.ini
@@ -0,0 +1,20 @@
+[Main]
+Demo=0
+
+[tf1]
+File(0) = tf0.exe|X
+File(8) = tf0300a.msk|X
+Patch = 1058
+Versione = 21511200
+
+[tf]
+Data = 17-09-2020
+Descrizione = Trasferimento fatture
+Dischi = 1
+Moduli = cg
+OEM = 
+Patch = 1058
+PostProcess = 
+PreProcess = 
+Versione = 21511200
+
diff --git a/cd/test/tf1058a1.zip b/cd/test/tf1058a1.zip
new file mode 100644
index 000000000..9a15b96bc
Binary files /dev/null and b/cd/test/tf1058a1.zip differ