Merge branch 'R_10_00' of http://10.65.20.33/sirio/CAMPO/campo into R_10_00

This commit is contained in:
Alessandro Bonazzi 2020-10-15 21:28:16 +02:00
commit 0096132377
17 changed files with 192 additions and 13 deletions

View File

@ -20,6 +20,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedocext", "vedocext.vcxpro
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lilib", "lilib.vcxproj", "{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cglib", "cglib.vcxproj", "{7B80F974-CE2E-4BD9-855A-44FF139FF288}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@ -50,6 +52,10 @@ Global
{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Debug|Win32.Build.0 = Debug|Win32
{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Release|Win32.ActiveCfg = Release|Win32
{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.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

View File

@ -145,7 +145,6 @@
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\cg\cgsaldac.cpp" />
<ClCompile Include="..\src\pr\pr0.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -255,6 +254,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="lilib.vcxproj">
<Project>{b61f0ad4-0cce-4371-8e92-85a26caf1a7c}</Project>
</ProjectReference>

View File

@ -61,9 +61,6 @@
<ClCompile Include="..\src\pr\pr0800.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cgsaldac.cpp">
<Filter>Sources</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<MskCompiler Include="..\src\pr\pr0500a.uml">

View File

@ -144,12 +144,6 @@
</Bscmake>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\cg\cgsaldac.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\pr\pr1.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -222,6 +216,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>

View File

@ -19,9 +19,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\cg\cgsaldac.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\pr\pr1.cpp">
<Filter>Sources</Filter>
</ClCompile>

3
cd/test/ca0998.txt Normal file
View File

@ -0,0 +1,3 @@
ca0300a.msk
Un livello di piano dei conti analitico è obbligatorio se non uso il piano dei conti contabile

26
cd/test/ca0998a.ini Normal file
View File

@ -0,0 +1,26 @@
[Main]
Demo=0
[ca0]
Edit_106 = ca0 -3
Edit_146 = ca0 -4
Edit_147 = ca0 -5
Edit_148 = ca0 -6
Edit_149 = ca0 -7
File(1) = ca0300a.msk|X
Patch = 998
Versione = 21511200
[ca]
Data = 03-02-2020
Descrizione = Contabilita' Analitica
Dischi = 1
Moduli = ba,cg
OEM =
Patch = 998
PostProcess =
PreProcess =
Prezzo(1) =
Prezzo(2) =
Versione = 21511200

BIN
cd/test/ca0998a1.zip Normal file

Binary file not shown.

3
cd/test/cg1002.txt Normal file
View File

@ -0,0 +1,3 @@
cg4a00a.msk
Corretta selezione causale di storno

98
cd/test/cg1002a.ini Normal file
View File

@ -0,0 +1,98 @@
[Main]
Demo=0
[cg4]
File(104) = cg4a00a.msk|X
Patch = 1002
Versione = 21511200
[cg99]
Kill(0) = batbesc.msk|x
Kill(1) = bastnot.rep|x
Kill(2) = bastmsp.rep|x
Kill(3) = batbver.msk|x
Kill(4) = batbntb.msk|x
Kill(5) = bastpor.rep|x
Kill(6) = bastreg.msk|x
Kill(7) = batbndo.msk|x
Kill(8) = bastcfi.msk|x
Kill(9) = bastpor.msk|x
Kill(10) = bastntb.rep|x
Kill(11) = bastpdb.msk|x
Kill(12) = bastleg.rep|x
Kill(13) = batbind.msk|x
Kill(14) = bastcve.rep|x
Kill(15) = batbcam.msk|x
Kill(16) = batbleg.msk|x
Kill(17) = batbscc.msk|x
Kill(18) = bastcam.rep|x
Kill(19) = bastcfi.rep|x
Kill(20) = bastcco.msk|x
Kill(21) = batblia.msk|x
Kill(22) = bastivd.rep|x
Kill(23) = batbivd.msk|x
Kill(24) = batbdpn.msk|x
Kill(25) = batbcve.msk|x
Kill(26) = bastarb.msk|x
Kill(27) = bastvet.rep|x
Kill(28) = batbcco.msk|x
Kill(29) = bastndo.msk|x
Kill(30) = bastver.msk|x
Kill(31) = batbtra.msk|x
Kill(32) = batbtit.msk|x
Kill(33) = batbarb.msk|x
Kill(34) = bastleg.msk|x
Kill(35) = bastdpn.rep|x
Kill(36) = bastreg.rep|x
Kill(37) = batbins.msk|x
Kill(38) = bastivd.msk|x
Kill(39) = bastver.rep|x
Kill(40) = bastscc.rep|x
Kill(41) = batbmsp.msk|x
Kill(42) = batbvet.msk|x
Kill(43) = batbpdb.msk|x
Kill(44) = bastdpn.msk|x
Kill(45) = bastpdb.rep|x
Kill(46) = bastzon.rep|x
Kill(47) = cgtbcon.msk|x
Kill(48) = bastcco.rep|x
Kill(49) = bastarb.rep|x
Kill(50) = bastesc.rep|x
Kill(51) = bastntb.msk|x
Kill(52) = bastnot.msk|x
Kill(53) = bastzon.msk|x
Kill(54) = bastcve.msk|x
Kill(55) = bastndo.rep|x
Kill(56) = bastcam.msk|x
Kill(57) = batbdel.msk|x
Kill(58) = batbpor.msk|x
Kill(59) = batbreg.msk|x
Kill(60) = cg2fppro.msk|x
Kill(61) = bastmsp.msk|x
Kill(62) = batblbu.msk|x
Kill(63) = batbzon.msk|x
Kill(64) = bastvet.msk|x
Kill(65) = bastscc.msk|x
Kill(66) = batblia.msk|x
Kill(67) = batbnot.msk|x
Kill(68) = bastesc.msk|x
Kill(69) = batbcfi.msk|x
Kill(70) = batbinl.msk|x
[cg]
Data = 01-10-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 = 1002
PostProcess = bainst -0 CG
PreProcess =
Prezzo(1) =
Prezzo(2) =
Versione = 21511200

BIN
cd/test/cg1002a1.zip Normal file

Binary file not shown.

3
cd/test/li0998.txt Normal file
View File

@ -0,0 +1,3 @@
limenu.men
Corretto il menu per la ricostruzione plafond.

19
cd/test/li0998a.ini Normal file
View File

@ -0,0 +1,19 @@
[Main]
Demo=0
[li0]
File(11) = limenu.men|X
Patch = 998
Versione = 21511200
[li]
Data = 18-08-2020
Descrizione = Dichiarazioni d'intento
Dischi = 1
Moduli = cg9
OEM =
Patch = 998
PostProcess =
PreProcess =
Versione = 21511200

BIN
cd/test/li0998a1.zip Normal file

Binary file not shown.

4
cd/test/pr0998.txt Normal file
View File

@ -0,0 +1,4 @@
pr0.exe
pr1.exe
Ricompilato il modulo ef per le nuove funzioni CONAI

24
cd/test/pr0998a.ini Normal file
View File

@ -0,0 +1,24 @@
[Main]
Demo=0
[pr0]
File(0) = pr0.exe|X
Patch = 998
Versione = 21511200
[pr1]
File(13) = pr1.exe|X
Patch = 998
Versione = 21511200
[pr]
Data = 17-06-2020
Descrizione = Provvigioni Agenti
Dischi = 1
Moduli = ve
OEM =
Patch = 998
PostProcess =
PreProcess =
Versione = 21511200

BIN
cd/test/pr0998a1.zip Normal file

Binary file not shown.