diff --git a/build/tc0.vcxproj b/build/tc0.vcxproj index 49e08b50a..33af2c947 100644 --- a/build/tc0.vcxproj +++ b/build/tc0.vcxproj @@ -70,7 +70,6 @@ .\..\debug/ .\..\debug/ .\..\debug/ - Level3 true ProgramDatabase @@ -123,7 +122,7 @@ NDEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) %(AdditionalDependencies) diff --git a/build/tc1.vcxproj b/build/tc1.vcxproj index 1fd63b350..a5a2ccabe 100644 --- a/build/tc1.vcxproj +++ b/build/tc1.vcxproj @@ -74,7 +74,7 @@ NDEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) %(AdditionalDependencies) @@ -113,7 +113,6 @@ .\..\debug/ .\..\debug/ .\..\debug/ - Level3 true ProgramDatabase diff --git a/build/tc2.vcxproj b/build/tc2.vcxproj index 03dbe956e..b24f60322 100644 --- a/build/tc2.vcxproj +++ b/build/tc2.vcxproj @@ -74,7 +74,7 @@ NDEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) %(AdditionalDependencies) @@ -113,7 +113,6 @@ .\..\debug/ .\..\debug/ .\..\debug/ - Level3 true ProgramDatabase diff --git a/build/tc3.vcxproj b/build/tc3.vcxproj index 7294923f3..dcdfeb866 100644 --- a/build/tc3.vcxproj +++ b/build/tc3.vcxproj @@ -74,7 +74,7 @@ NDEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) %(AdditionalDependencies) @@ -113,7 +113,6 @@ .\..\debug/ .\..\debug/ .\..\debug/ - Level3 true ProgramDatabase diff --git a/build/tc8.vcxproj b/build/tc8.vcxproj index 1cd763008..6069974be 100644 --- a/build/tc8.vcxproj +++ b/build/tc8.vcxproj @@ -68,7 +68,6 @@ _DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions) false MultiThreadedDebug - Level3 true ProgramDatabase @@ -107,7 +106,7 @@ MaxSpeed - ..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories) + ..\src\include;..\src\xvaga;..\src\xvtdb;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions) true MultiThreaded @@ -119,7 +118,7 @@ NDEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) %(AdditionalDependencies) diff --git a/build/tc9.vcxproj b/build/tc9.vcxproj index 1eeefbc34..e87becfa0 100644 --- a/build/tc9.vcxproj +++ b/build/tc9.vcxproj @@ -76,7 +76,7 @@ NDEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) %(AdditionalDependencies) @@ -111,7 +111,6 @@ _DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions) false MultiThreadedDebug - Level3 true ProgramDatabase diff --git a/cd/test/tc0848.txt b/cd/test/tc0848.txt new file mode 100644 index 000000000..0a8e017e7 --- /dev/null +++ b/cd/test/tc0848.txt @@ -0,0 +1,3 @@ +tc8.exe + +In Esportazione PayLine aggiunta scrittura ultimi due campi a vuoto sotto richiesta diff --git a/cd/test/tc0848a.ini b/cd/test/tc0848a.ini new file mode 100644 index 000000000..31dcdbefc --- /dev/null +++ b/cd/test/tc0848a.ini @@ -0,0 +1,26 @@ +[Main] +Demo=0 + +[tc8] +File(59) = tc8.exe|X +Patch = 0848 +Versione = 21511200 + +[tc99] +Kill(0) = tctstabm.txt|x +Kill(1) = tsricl.txt|x +Kill(2) = tstab.txt|x + +[tc] +Data = 03-07-2019 +Descrizione = Trasferimento ad altre Contabilità +Dischi = 1 +Moduli = cg +OEM = +Patch = 848 +PostProcess = +PreProcess = +Prezzo(1) = +Prezzo(2) = +Versione = 21511200 + diff --git a/cd/test/tc0848a1.zip b/cd/test/tc0848a1.zip new file mode 100644 index 000000000..9534b69ea Binary files /dev/null and b/cd/test/tc0848a1.zip differ diff --git a/src/cg/cg2100.cpp b/src/cg/cg2100.cpp index 1d9a9e4ee..0347ebf6d 100755 --- a/src/cg/cg2100.cpp +++ b/src/cg/cg2100.cpp @@ -369,7 +369,7 @@ bool TPrimanota_application::read_caus(const char* cod, int year) cgm.enable(DLG_USER, show_games); if (iva == nessuna_iva) { - m->enable(F_PROVVISORIO, !_is_saldaconto); // Il saldaconto vieta i movimenti provvisori +// m->enable(F_PROVVISORIO, !_is_saldaconto); // Il saldaconto vieta i movimenti provvisori m->show(SK_TIPORIGA, is_pagamento()); // Abilita scelta tipo riga m->enable(SK_TIPORIGA); activate_numrif(*m, false); diff --git a/src/cg/cg2100c.uml b/src/cg/cg2100c.uml index eb02ca113..167802ba5 100755 --- a/src/cg/cg2100c.uml +++ b/src/cg/cg2100c.uml @@ -184,7 +184,6 @@ BEGIN ITEM "N|Si (Non cancellabile)" ITEM "B|Si (Bilancio costi/ricavi)" ITEM "C|Si (Cespiti)" - FLAGS "DG" END STRING F_DESCAGG 5 6