From ca7c720d39d3c28fdeef53dd77e2b58831cbc92a Mon Sep 17 00:00:00 2001 From: Sirio Builder Date: Mon, 22 Feb 2021 18:02:45 +0100 Subject: [PATCH] Patch level : 12.0 1034 Files correlati : m770 77tbca7.msk Commento : Patch 77tbca7.msk Corrette diciture 12,13 ed aggiunte. Certificazione lavoro autonomo, provvigioni e redditi diversi --- build/770.vcxproj | 3 ++- build/771mod.vcxproj | 4 ++-- build/772mod.vcxproj | 4 ++-- build/773mod.vcxproj | 4 ++-- build/774.vcxproj | 4 ++-- build/775.vcxproj | 4 ++-- build/776mod.vcxproj | 4 ++-- build/777.vcxproj | 3 ++- build/Cb6.vcxproj | 3 +-- build/gfm.vcxproj | 2 +- build/pdflib_dll.vcxproj | 3 ++- build/ps0830.vcxproj | 8 ++++---- build/tf0.vcxproj | 4 ++-- cd/test/771034.txt | 4 ++++ cd/test/771034a.ini | 27 +++++++++++++++++++++++++++ cd/test/771034a1.zip | Bin 0 -> 5050 bytes src/ve/ve2700.cpp | 6 +++--- 17 files changed, 60 insertions(+), 27 deletions(-) create mode 100644 cd/test/771034.txt create mode 100644 cd/test/771034a.ini create mode 100644 cd/test/771034a1.zip diff --git a/build/770.vcxproj b/build/770.vcxproj index 85706a442..334fcab10 100644 --- a/build/770.vcxproj +++ b/build/770.vcxproj @@ -144,7 +144,8 @@ .\..\release/770.bsc - "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)" + + diff --git a/build/771mod.vcxproj b/build/771mod.vcxproj index c0121aa38..e9d4b8658 100644 --- a/build/771mod.vcxproj +++ b/build/771mod.vcxproj @@ -96,7 +96,8 @@ .\..\release/771mod.bsc - "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)" + + @@ -115,7 +116,6 @@ _DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions) false MultiThreadedDebug - Level3 true ProgramDatabase diff --git a/build/772mod.vcxproj b/build/772mod.vcxproj index 2ff24a34d..e3b11f1a6 100644 --- a/build/772mod.vcxproj +++ b/build/772mod.vcxproj @@ -96,7 +96,8 @@ .\..\release/772mod.bsc - "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)" + + @@ -116,7 +117,6 @@ false MultiThreadedDebug .\..\debug/772mod.pch - Level3 true ProgramDatabase diff --git a/build/773mod.vcxproj b/build/773mod.vcxproj index 848c739e9..40ec78b2a 100644 --- a/build/773mod.vcxproj +++ b/build/773mod.vcxproj @@ -69,7 +69,6 @@ false MultiThreadedDebug .\..\debug/773mod.pch - Level3 true ProgramDatabase @@ -143,7 +142,8 @@ .\..\release/773mod.bsc - "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)" + + diff --git a/build/774.vcxproj b/build/774.vcxproj index 10bfe241f..650b82101 100644 --- a/build/774.vcxproj +++ b/build/774.vcxproj @@ -69,7 +69,6 @@ false MultiThreadedDebug .\..\debug/774.pch - Level3 true ProgramDatabase @@ -143,7 +142,8 @@ .\..\release/774.bsc - "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)" + + diff --git a/build/775.vcxproj b/build/775.vcxproj index 2312f384f..a9f811a92 100644 --- a/build/775.vcxproj +++ b/build/775.vcxproj @@ -96,7 +96,8 @@ .\..\release/775.bsc - "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)" + + @@ -116,7 +117,6 @@ false MultiThreadedDebug .\..\debug/775.pch - Level3 true ProgramDatabase diff --git a/build/776mod.vcxproj b/build/776mod.vcxproj index c23858837..427bc8125 100644 --- a/build/776mod.vcxproj +++ b/build/776mod.vcxproj @@ -69,7 +69,6 @@ false MultiThreadedDebug .\..\debug/776mod.pch - Level3 true ProgramDatabase @@ -145,7 +144,8 @@ .\..\release/776mod.bsc - "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)" + + diff --git a/build/777.vcxproj b/build/777.vcxproj index 9f619201d..082d4c66e 100644 --- a/build/777.vcxproj +++ b/build/777.vcxproj @@ -142,7 +142,8 @@ .\..\release/777.bsc - "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)" + + diff --git a/build/Cb6.vcxproj b/build/Cb6.vcxproj index 46b2addfd..97aebe8ea 100644 --- a/build/Cb6.vcxproj +++ b/build/Cb6.vcxproj @@ -94,8 +94,7 @@ $(IntDir)$(TargetName).bsc - - + "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" /fd sha256 /tr http://timestamp.digicert.com /v "$(TargetPath)" diff --git a/build/gfm.vcxproj b/build/gfm.vcxproj index 93f3c6156..2d281319e 100644 --- a/build/gfm.vcxproj +++ b/build/gfm.vcxproj @@ -140,7 +140,7 @@ $(IntDir)$(TargetName).bsc - "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)" + "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" /fd sha256 /tr http://timestamp.digicert.com /v "$(TargetPath)" diff --git a/build/pdflib_dll.vcxproj b/build/pdflib_dll.vcxproj index 83d388618..4c656e159 100644 --- a/build/pdflib_dll.vcxproj +++ b/build/pdflib_dll.vcxproj @@ -135,7 +135,8 @@ $(IntDir)$(TargetName).bsc - "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)" + + diff --git a/build/ps0830.vcxproj b/build/ps0830.vcxproj index 128c7323c..62050ca4c 100644 --- a/build/ps0830.vcxproj +++ b/build/ps0830.vcxproj @@ -124,7 +124,7 @@ NDEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) wsock32.lib;%(AdditionalDependencies) @@ -179,14 +179,14 @@ true - - - {2d38a763-3d74-4338-9362-b891784ec90e} + + + diff --git a/build/tf0.vcxproj b/build/tf0.vcxproj index 22f4a3d0c..31a2c3789 100644 --- a/build/tf0.vcxproj +++ b/build/tf0.vcxproj @@ -68,7 +68,6 @@ _DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions) false MultiThreadedDebug - Level3 true ProgramDatabase @@ -144,7 +143,8 @@ .\..\release/tf0.bsc - "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)" + + diff --git a/cd/test/771034.txt b/cd/test/771034.txt new file mode 100644 index 000000000..10ca7fe3d --- /dev/null +++ b/cd/test/771034.txt @@ -0,0 +1,4 @@ +77tbca7.msk + +Corrette diciture 12,13 ed aggiunte. +Certificazione lavoro autonomo, provvigioni e redditi diversi diff --git a/cd/test/771034a.ini b/cd/test/771034a.ini new file mode 100644 index 000000000..7d3c007ba --- /dev/null +++ b/cd/test/771034a.ini @@ -0,0 +1,27 @@ +[Main] +Demo=0 + +[771] +File(121) = 77tbca7.msk|X +Patch = 1034 +Versione = 21511200 + +[7799] +Kill(0) = batbcaf.msk|x +Kill(1) = batbca7.msk|x +Kill(2) = batbent.msk|x + +[77] +Data = 22-02-2021 +Descrizione = Percipienti (Mod.770) +Dischi = 1 +Edit_4 = 770 -3 +Moduli = ba +OEM = +Patch = 1034 +PostProcess = +PreProcess = +Prezzo(1) = +Prezzo(2) = +Versione = 21511200 + diff --git a/cd/test/771034a1.zip b/cd/test/771034a1.zip new file mode 100644 index 0000000000000000000000000000000000000000..a7676c2662c91b2e5682cee9d4cb4645bd1554d8 GIT binary patch literal 5050 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 zR#N_J!ze-%002`!000XB00000000000000000000H#c-*V_`QgZF6f-O9ci100001 Q0096w0001M6951J07!O=uK)l5 literal 0 HcmV?d00001 diff --git a/src/ve/ve2700.cpp b/src/ve/ve2700.cpp index b05852895..71ee60d52 100755 --- a/src/ve/ve2700.cpp +++ b/src/ve/ve2700.cpp @@ -1180,9 +1180,9 @@ void TAggiorna_listini::main_loop() bool TAggiorna_listini::create() { - Tdninst dninst; - if (!dninst.can_I_run(true)) - return error_box(TR("Programma non autorizzato!")); + // Tdninst dninst; + // if (!dninst.can_I_run(true)) + // return error_box(TR("Programma non autorizzato!")); return TSkeleton_application::create(); }