diff --git a/build/ct0.vcxproj b/build/ct0.vcxproj index 0402de2f3..b94190881 100644 --- a/build/ct0.vcxproj +++ b/build/ct0.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,15 +13,18 @@ {E3E7DE6C-EDE3-48D4-8F15-333B71AE4AC2} ct0 + 10.0.17763.0 Application false + v141 Application false + v141 @@ -64,7 +67,6 @@ _DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions) false MultiThreadedDebug - Level3 true ProgramDatabase @@ -74,7 +76,7 @@ _DEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) version.lib;wsock32.lib;comctl32.lib;rpcrt4.lib;%(AdditionalDependencies) @@ -120,7 +122,7 @@ NDEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) %(AdditionalDependencies) diff --git a/build/db0.vcxproj b/build/db0.vcxproj index 7065228a4..27bc8a176 100644 --- a/build/db0.vcxproj +++ b/build/db0.vcxproj @@ -83,7 +83,7 @@ NDEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) %(AdditionalDependencies) diff --git a/build/db1.vcxproj b/build/db1.vcxproj index 7360bd0a8..0cf7240cf 100644 --- a/build/db1.vcxproj +++ b/build/db1.vcxproj @@ -81,7 +81,7 @@ NDEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) %(AdditionalDependencies) diff --git a/build/db2.vcxproj b/build/db2.vcxproj index d70cc1b39..0131e08b4 100644 --- a/build/db2.vcxproj +++ b/build/db2.vcxproj @@ -128,7 +128,7 @@ NDEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) %(AdditionalDependencies) diff --git a/build/dt.sln b/build/dt.sln index 83a3bd56e..601256601 100644 --- a/build/dt.sln +++ b/build/dt.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.2092 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dt0", "dt0.vcproj", "{A85CE675-35D0-40FD-BCF7-505246AE3B9F}" ProjectSection(ProjectDependencies) = postProject {A1CE9743-A597-4F92-B55A-345A366C9E55} = {A1CE9743-A597-4F92-B55A-345A366C9E55} @@ -26,4 +28,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {417040D0-658E-4F84-9ECE-26CD16DD00E8} + EndGlobalSection EndGlobal diff --git a/cd/test/fp1190.txt b/cd/test/fp1190.txt new file mode 100644 index 000000000..0c58d9c84 --- /dev/null +++ b/cd/test/fp1190.txt @@ -0,0 +1,3 @@ +fp0.exe + +Corretto errore sull'invio integrazioni. Nei dati Riepilogo iva le righe con aliquota non venivano sommate. (Segnalazione Sicart) diff --git a/cd/test/fp1190a.ini b/cd/test/fp1190a.ini new file mode 100644 index 000000000..c5a8c5a79 --- /dev/null +++ b/cd/test/fp1190a.ini @@ -0,0 +1,22 @@ +[Main] +Demo=0 + +[fp0] +File(0) = fp0.exe|X +Patch = 1190 +Versione = 21511200 + +[fp99] +Kill(0) = fppro.msk|x + +[fp] +Data = 08-09-2022 +Descrizione = Fattura Elettronica +Dischi = 1 +Moduli = cg,ve +OEM = +Patch = 1190 +PostProcess = +PreProcess = +Versione = 21511200 + diff --git a/cd/test/fp1190a1.zip b/cd/test/fp1190a1.zip new file mode 100644 index 000000000..cf381fef6 Binary files /dev/null and b/cd/test/fp1190a1.zip differ diff --git a/src/db/db1100.cpp b/src/db/db1100.cpp index 31cf11395..30c8a5dfc 100755 --- a/src/db/db1100.cpp +++ b/src/db/db1100.cpp @@ -11,7 +11,7 @@ #include #include -#include "../cg/cglib01.h" +#include "../cg/cglib.h" #include "../mg/mglib.h" #include "../ve/velib.h" #include "dblib.h" diff --git a/src/db/db1300.cpp b/src/db/db1300.cpp index 64dc7af85..2f9214c51 100755 --- a/src/db/db1300.cpp +++ b/src/db/db1300.cpp @@ -454,7 +454,7 @@ int TImplosion_mask::find_roots(const char* articolo, TAssoc_array& roots) const TAssoc_array ass[2]; int c = 0; // Array dei children = 0; fathers = 1 - ass[c].add(articolo, NULL); + ass[c].add(articolo); const char* cap = FR("Livello %d - Articoli %ld"); TString caption; caption.format(cap, 0, 0L); @@ -478,7 +478,7 @@ int TImplosion_mask::find_roots(const char* articolo, TAssoc_array& roots) const for (cur = 0L; cur.pos() < cur.items(); ++cur) { const TString& father = cur.curr().get("CODDIST"); - ass[!c].add(father, NULL); + ass[!c].add(father); } cur.freeze(FALSE); } @@ -559,7 +559,7 @@ void TImplosion_mask::implode_slow() key << row->get(); key.rtrim(); } - _xmas.add(key, NULL); + _xmas.add(key); } } @@ -623,7 +623,7 @@ void TImplosion_mask::implode_medium() key = articolo; if (livello.not_empty()) key << '|' << livello; - _xmas.add(key, NULL); + _xmas.add(key); TAssoc_array roots; const long items = find_roots(articolo, roots);