root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/R_10_00' into R_10_00

Browse Source
This commit is contained in:
Mattia Tollari 2019-05-13 11:10:36 +02:00
commit f5fd50150f
99 changed files with 1523 additions and 359 deletions

2
build/773mod.vcxproj

@ -81,7 +81,7 @@
</ResourceCompile>
<Link>
<AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\exed/773mod.exe</OutputFile>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>

11
build/Cg0.vcxproj

@ -233,7 +233,6 @@
<MskCompiler Include="..\src\cg\cg0500a.uml" />
<MskCompiler Include="..\src\cg\cg0700a.uml" />
<MskCompiler Include="..\src\cg\cg0800a.uml" />
<MskCompiler Include="..\src\cg\cg4300a.uml" />
</ItemGroup>
<ItemGroup>
<TrrCompiler Include="..\src\cg\f103.trr" />
@ -290,6 +289,7 @@
<ClInclude Include="..\src\cg\cg0500.h" />
<ClInclude Include="..\src\cg\cg0700a.h" />
<ClInclude Include="..\src\cg\cg0800a.h" />
<ClInclude Include="..\src\cg\cglib05.h" />
<ClInclude Include="..\src\cg\cgpim.h" />
</ItemGroup>
<ItemGroup>
@ -315,10 +315,11 @@
<Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<RepCompiler Include="..\src\cg\cg0800a.rep" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ItemGroup>
<RepCompiler Include="..\src\cg\cg0800a.rep">
<SubType>Designer</SubType>
</RepCompiler>
</ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="CampoRules.targets" />
</ImportGroup>

6
build/Cg0.vcxproj.filters

@ -98,9 +98,6 @@
<MskCompiler Include="..\src\cg\cg0400b.uml">
<Filter>Masks</Filter>
</MskCompiler>
<MskCompiler Include="..\src\cg\cg4300a.uml">
<Filter>Masks</Filter>
</MskCompiler>
<MskCompiler Include="..\src\cg\cg0800a.uml">
<Filter>Masks</Filter>
</MskCompiler>
@ -263,6 +260,9 @@
<ClInclude Include="..\src\cg\cg0800a.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\src\cg\cglib05.h">
<Filter>Headers</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="campo.rc" />

2
build/Cg4.vcxproj

@ -118,7 +118,6 @@
<PreprocessorDefinitions>_DEBUG;WIN32;__LONGDOUBLE__;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@ -332,6 +331,7 @@
<ClInclude Include="..\src\cg\cg4900a.h" />
<ClInclude Include="..\src\cg\cg4a00a.h" />
<ClInclude Include="..\src\cg\cg4b00a.h" />
<ClInclude Include="..\src\cg\cglib01.h" />
<ClInclude Include="..\src\cg\cglib05.h" />
</ItemGroup>
<ItemGroup>

3
build/Cg4.vcxproj.filters

@ -224,6 +224,9 @@
<ClInclude Include="..\src\cg\cglib05.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\src\cg\cglib01.h">
<Filter>Headers</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="campo.rc" />

3
build/Cg7.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>EditAndContinue</DebugInformationFormat>
@ -160,6 +159,7 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\ba\ba8500.cpp" />
<ClCompile Include="..\src\cg\cg2103.cpp" />
<ClCompile Include="..\src\cg\cg7.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -183,6 +183,7 @@
<ClCompile Include="..\src\cg\cgpim.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\cg\cg2103.h" />
<ClInclude Include="..\src\cg\cg7400a.h" />
<ClInclude Include="..\src\cg\cg5900a.h" />
<ClInclude Include="..\src\cg\cg7.h" />

6
build/Cg7.vcxproj.filters

@ -37,6 +37,9 @@
<ClCompile Include="..\src\cg\cg7800.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cg2103.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\cg\cg7.h">
@ -63,6 +66,9 @@
<ClInclude Include="..\src\cg\ivadiff.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\cg\cg2103.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="Source Files">

2
build/Cg7.vcxproj.user

@ -3,6 +3,6 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
<LocalDebuggerCommandArguments>-6 -uADMIN</LocalDebuggerCommandArguments>
<LocalDebuggerCommandArguments>-5 -uADMIN</LocalDebuggerCommandArguments>
</PropertyGroup>
</Project>

16
build/ca3.vcxproj

@ -293,7 +293,9 @@
</ItemGroup>
<ItemGroup>
<RepCompiler Include="..\src\ca\ca3100a.rep" />
<RepCompiler Include="..\src\ca\ca3100b.rep" />
<RepCompiler Include="..\src\ca\ca3100b.rep">
<SubType>Designer</SubType>
</RepCompiler>
<RepCompiler Include="..\src\ca\ca3200a.rep" />
<RepCompiler Include="..\src\ca\ca3200b.rep" />
<RepCompiler Include="..\src\ca\ca3300a.rep" />
@ -302,9 +304,15 @@
<RepCompiler Include="..\src\ca\ca3300d.rep" />
<RepCompiler Include="..\src\ca\ca3600a.rep" />
<RepCompiler Include="..\src\ca\ca3700a.rep" />
<RepCompiler Include="..\src\ca\ca3800a.rep" />
<RepCompiler Include="..\src\ca\ca3800b.rep" />
<RepCompiler Include="..\src\ca\ca3800c.rep" />
<RepCompiler Include="..\src\ca\ca3800a.rep">
<SubType>Designer</SubType>
</RepCompiler>
<RepCompiler Include="..\src\ca\ca3800b.rep">
<SubType>Designer</SubType>
</RepCompiler>
<RepCompiler Include="..\src\ca\ca3800c.rep">
<SubType>Designer</SubType>
</RepCompiler>
<RepCompiler Include="..\src\ca\ca3900a.rep" />
</ItemGroup>
<ItemGroup>

4
build/crpa.sln

@ -20,8 +20,8 @@ Global
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{E3E7DE6C-EDE3-48D4-8F15-333B71AE4AC2}.Debug|Win32.ActiveCfg = Debug|Win32
{E3E7DE6C-EDE3-48D4-8F15-333B71AE4AC2}.Debug|Win32.Build.0 = Debug|Win32
{E3E7DE6C-EDE3-48D4-8F15-333B71AE4AC2}.Release|Win32.ActiveCfg = Debug|Win32
{E3E7DE6C-EDE3-48D4-8F15-333B71AE4AC2}.Release|Win32.Build.0 = Debug|Win32
{E3E7DE6C-EDE3-48D4-8F15-333B71AE4AC2}.Release|Win32.ActiveCfg = Release|Win32
{E3E7DE6C-EDE3-48D4-8F15-333B71AE4AC2}.Release|Win32.Build.0 = Release|Win32
{2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.ActiveCfg = Debug|Win32
{2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.Build.0 = Debug|Win32
{2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.ActiveCfg = Release|Win32

12
build/crpa0.vcxproj

@ -41,8 +41,8 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\exed\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\$(ProjectName)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\exe\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\obj\$(SolutionName)\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\exe\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\obj\$(SolutionName)\$(ProjectName)\</IntDir>
@ -63,7 +63,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\src\include;..\src\xvaga;..\src\xvtdb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\src\include;..\src\xvaga;..\src\xvtdb;..\src\xvtdb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@ -109,7 +109,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\src\include;..\src\xvaga;..\src\xvtdb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@ -153,7 +153,9 @@
</CustomBuildStep>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="campo.rc" />
<ResourceCompile Include="campo.rc">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="AgaLib.vcxproj">

BIN
build/fastrip.exe

Binary file not shown.

4
build/fastrip.vcxproj

@ -14,8 +14,8 @@
<ProjectGuid>{68251613-3B9A-4F87-9F40-827C46267ADE}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>fastrip</RootNamespace>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>

5
build/fd.vcxproj

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@ -15,18 +15,21 @@
<Keyword>Win32Proj</Keyword>
<RootNamespace>fd</RootNamespace>
<ProjectName>fd0</ProjectName>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">

1
build/lv0.vcxproj

@ -144,6 +144,7 @@
<Version>12.0</Version>
<ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
<ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

1
build/lv1.vcxproj

@ -146,6 +146,7 @@
<Version>12.0</Version>
<ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
<ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

1
build/lv2.vcxproj

@ -143,6 +143,7 @@
<Version>12.0</Version>
<ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
<ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

2
build/lv3.vcxproj

@ -144,6 +144,7 @@
<Version>12.0</Version>
<ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
<ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
@ -188,6 +189,7 @@
<ClInclude Include="..\src\lv\lv3600a.h" />
<ClInclude Include="..\src\lv\lv3700a.h" />
<ClInclude Include="..\src\lv\lv3uml.h" />
<ClInclude Include="..\src\ve\ve0100.h" />
</ItemGroup>
<ItemGroup>
<CustomBuildStep Include="..\lib\AgaLib.lib">

3
build/lv3.vcxproj.filters

@ -100,6 +100,9 @@
<ClInclude Include="..\src\lv\lv3uml.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\src\ve\ve0100.h">
<Filter>Headers</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="campo.rc" />

1
build/lv4.vcxproj

@ -147,6 +147,7 @@
<Version>12.0</Version>
<ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
<ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

6
build/mr0.vcxproj

@ -63,10 +63,9 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\src\xi;..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\src\xi;..\src\include;..\src\xvaga;../src/xvtdb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -74,7 +73,7 @@
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;__LONGDOUBLE__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>version.lib;wsock32.lib;comctl32.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -84,6 +83,7 @@
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

6
build/mr1.vcxproj

@ -105,7 +105,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\src\include;..\src\xvaga;..\src\xi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\src\include;..\src\xvaga;..\src\xi;../src/xvtdb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;DBG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@ -113,7 +113,6 @@
<AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
<ObjectFileName>.\..\debug/</ObjectFileName>
<ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -121,7 +120,7 @@
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;__LONGDOUBLE__%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>version.lib;wsock32.lib;comctl32.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -135,6 +134,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

6
build/mr2.vcxproj

@ -63,11 +63,10 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\src\include;..\src\xvaga;..\src\xi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\src\include;..\src\xvaga;..\src\xi;../src/xvtdb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -76,7 +75,7 @@
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;__LONGDOUBLE__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>version.lib;wsock32.lib;comctl32.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -91,6 +90,7 @@
<TargetMachine>MachineX86</TargetMachine>
<Version>12.0</Version>
<Profile>false</Profile>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

2
build/msk232.bat

@ -8,7 +8,7 @@ type ..\src\include\uml.h >%TMP%\%~n1.tmp
type %1 >>%TMP%\%~n1.tmp
cl /nologo /EP %TMP%\%~n1.tmp >%TMP%\%~n1.tm2
patchdef %TMP%\%~n1.tm2 %TMP%\%TMP%\%~n1.tm3
patchdef %TMP%\%~n1.tm2 %TMP%\%~n1.tm3
type ..\src\include\uml.h >%TMP%\%~n1.uml
type %TMP%\%~n1.tm3 >>%TMP%\%~n1.uml

5
build/pg0001.vcxproj

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@ -12,15 +12,18 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{9D5735F1-EE47-4ED3-929A-048FFF8B6344}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">

5
build/pg0067.vcxproj

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@ -12,15 +12,18 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{453301DF-028E-479F-9548-C2346AD8C6ED}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">

5
build/pg0068.vcxproj

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@ -12,15 +12,18 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{DE9692C8-AD5E-4AD1-A0BB-16B9A4F722F1}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">

5
build/pg0069.vcxproj

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@ -12,15 +12,18 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{3B1237FC-2632-448E-B5F1-A1B2A3278E47}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">

5
build/pg0388.vcxproj

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@ -12,15 +12,18 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{4E392B08-31F0-48CC-AC05-5C6EE7A6473C}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">

5
build/pi0001.vcxproj

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@ -12,15 +12,18 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{5379F62B-868B-4469-9FC9-993AF9ADE381}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">

5
build/pi0002.vcxproj

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@ -12,15 +12,18 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{F154352E-CF6F-44A1-B45F-BAE74281A0AD}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">

5
build/pl0001.vcxproj

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@ -12,15 +12,18 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{EAA83FEF-B3E6-4BDE-B746-2BE727FA057A}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">

5
build/pl0002.vcxproj

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@ -12,15 +12,18 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{69D3E5F4-0C68-4171-9296-D01B7E885C89}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">

4
build/ps0017.vcxproj

@ -42,7 +42,7 @@
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\exe\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\exed\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\exe\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
</PropertyGroup>
@ -116,7 +116,6 @@
<AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
<ObjectFileName>.\..\debug/</ObjectFileName>
<ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -138,6 +137,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>true</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

4
build/ps0077.vcxproj

@ -68,7 +68,6 @@
<AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
<ObjectFileName>.\..\debug/</ObjectFileName>
<ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -76,7 +75,7 @@
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -90,6 +89,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

4
build/ps0099.vcxproj

@ -114,7 +114,6 @@
<AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
<ObjectFileName>.\..\debug/</ObjectFileName>
<ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -122,7 +121,7 @@
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -136,6 +135,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

4
build/ps0330.vcxproj

@ -68,7 +68,6 @@
<AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
<ObjectFileName>.\..\debug/</ObjectFileName>
<ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -76,7 +75,7 @@
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -90,6 +89,7 @@
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

5
build/ps0398.vcxproj

@ -66,7 +66,6 @@
<AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
<ObjectFileName>.\..\debug/</ObjectFileName>
<ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -74,7 +73,7 @@
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -87,6 +86,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
@ -115,7 +115,6 @@
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
</ClCompile>

4
build/ps0430.vcxproj

@ -113,7 +113,6 @@
<AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
<ObjectFileName>.\..\debug/</ObjectFileName>
<ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -121,7 +120,7 @@
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -135,6 +134,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

2
build/ps0431.vcxproj

@ -108,7 +108,6 @@
<PreprocessorDefinitions>_DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -130,6 +129,7 @@
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<Version>12.0</Version>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

4
build/ps0544.vcxproj

@ -113,7 +113,6 @@
<AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
<ObjectFileName>.\..\debug/</ObjectFileName>
<ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -121,7 +120,7 @@
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -135,6 +134,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

3
build/ps0713.vcxproj

@ -67,7 +67,6 @@
<AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
<ObjectFileName>.\..\debug/</ObjectFileName>
<ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -75,7 +74,7 @@
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>

4
build/ps0816.vcxproj

@ -66,7 +66,6 @@
<AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
<ObjectFileName>.\..\debug/</ObjectFileName>
<ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -74,7 +73,7 @@
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -88,6 +87,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

4
build/ps0830.vcxproj

@ -66,7 +66,6 @@
<AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
<ObjectFileName>.\..\debug/</ObjectFileName>
<ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -74,7 +73,7 @@
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -88,6 +87,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

4
build/ps0872.vcxproj

@ -114,7 +114,6 @@
<AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
<ObjectFileName>.\..\debug/</ObjectFileName>
<ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -122,7 +121,7 @@
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -136,6 +135,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

4
build/ps0883.vcxproj

@ -68,7 +68,6 @@
<PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;__LONGDOUBLE__</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -77,7 +76,7 @@
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -91,6 +90,7 @@
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<Version>12.0</Version>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

2
build/ps0913 .vcxproj

@ -67,7 +67,6 @@
<AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
<ObjectFileName>.\..\debug/</ObjectFileName>
<ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -89,6 +88,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

6
build/ps0920.vcxproj

@ -41,7 +41,7 @@
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\exe\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\obj\$(SolutionName)\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\exe\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\obj\$(SolutionName)\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
@ -66,7 +66,6 @@
<AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
<ObjectFileName>.\..\debug/</ObjectFileName>
<ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -74,7 +73,7 @@
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -88,6 +87,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

4
build/ps0925.vcxproj

@ -66,7 +66,6 @@
<AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
<ObjectFileName>.\..\debug/</ObjectFileName>
<ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -74,7 +73,7 @@
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -88,6 +87,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

4
build/ps0982 .vcxproj

@ -67,7 +67,6 @@
<AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
<ObjectFileName>.\..\debug/</ObjectFileName>
<ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -75,7 +74,7 @@
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -89,6 +88,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

4
build/ps1001.vcxproj

@ -67,7 +67,6 @@
<AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
<ObjectFileName>.\..\debug/</ObjectFileName>
<ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -75,7 +74,7 @@
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -89,6 +88,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

2
build/ps1004.vcxproj

@ -116,7 +116,6 @@
<AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
<ObjectFileName>.\..\debug/</ObjectFileName>
<ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -138,6 +137,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

5
build/ps1100.vcxproj

@ -66,7 +66,6 @@
<AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
<ObjectFileName>.\..\debug/</ObjectFileName>
<ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -74,7 +73,7 @@
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -88,6 +87,8 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<LinkErrorReporting>PromptImmediately</LinkErrorReporting>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

4
build/ps1104.vcxproj

@ -66,7 +66,6 @@
<AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
<ObjectFileName>.\..\debug/</ObjectFileName>
<ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -74,7 +73,7 @@
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -88,6 +87,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

5
build/pt0001.vcxproj

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@ -12,15 +12,18 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{1479CB30-7DF8-4F92-A3E6-856EA6F2210C}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">

5
build/pt0003.vcxproj

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@ -12,15 +12,18 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{0AA531D2-E451-4214-B9CE-E06C9E42BA2D}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">

5
build/pt0195.vcxproj

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@ -12,15 +12,18 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{6796CEDE-A4D5-4340-B24D-F0E7DCEF050D}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">

1
build/tf0.vcxproj

@ -92,6 +92,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

3
build/ve0.vcxproj

@ -66,7 +66,8 @@
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\src\li;../src/include;../src/xvaga;../src/xvtdb;../src/xvturl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;__LONGDOUBLE__</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<MinimalRebuild>
</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>

2
build/ve3.vcxproj

@ -68,7 +68,6 @@
<PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;__LONGDOUBLE__</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -93,6 +92,7 @@
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>

3
cd/test/cg0782.txt Normal file

@ -0,0 +1,3 @@
cg2.exe
Aggiunti controlli sul tipodoc per collegamento fppro

94
cd/test/cg0782a.ini Normal file

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

BIN
cd/test/cg0782a1.zip Normal file

Binary file not shown.

16
cd/test/cg0786.txt Normal file

@ -0,0 +1,16 @@
cg2.exe
cg2fppro.msk
cg2100c.msk
Spostato bottone Fatture SDI, aggiunto separatore
Modificata query per:
ricerca di default con codice fornitore associato in FPPRO;
salvataggio verifica fattura,
p. iva,
query con data;
Corretto caricamento chiavi db sbagliato: prendeva sempre gli stessi dati (ultimo record)
Aggiunta possibilita di ricerca per p. iva
Aggiunto filtro data documento
Caricamento automatico alla pressione dei flag
Aggiunto controllo sul tipo documento per Nota Credito di Acquisto
Aggiunta colonna per tipo documento

96
cd/test/cg0786a.ini Normal file

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

BIN
cd/test/cg0786a1.zip Normal file

Binary file not shown.

3
cd/test/fp0782.txt Normal file

@ -0,0 +1,3 @@
fp0.exe
Corretta esportazione banca appoggio/presentazione per fe

19
cd/test/fp0782a.ini Normal file

@ -0,0 +1,19 @@
[Main]
Demo=0
[fp1]
File(0) = fp0.exe|X
Patch = 0782
Versione = 21511200
[fp]
Data = 03-05-2019
Descrizione = Fattura Elettronica
Dischi = 1
Moduli = cg,ve
OEM =
Patch = 782
PostProcess =
PreProcess =
Versione = 21511200

BIN
cd/test/fp0782a1.zip Normal file

Binary file not shown.

3
cd/test/or0784.txt Normal file

@ -0,0 +1,3 @@
or1100a.msk
Ricerca per ragione sociale cliente/fornitore nella stampa ordini

21
cd/test/or0784a.ini Normal file

@ -0,0 +1,21 @@
[Main]
Demo=0
[or1]
File(4) = or1100a.msk|X
Patch = 784
Versione = 21511200
[or]
Data = 06-06-2016
Descrizione = Ordini
Dischi = 1
Moduli = ve
OEM =
Patch = 784
PostProcess =
PreProcess =
Prezzo(1) =
Prezzo(2) =
Versione = 21511200

BIN
cd/test/or0784a1.zip Normal file

Binary file not shown.

5
cd/test/ve0780.txt Normal file

@ -0,0 +1,5 @@
ve0.exe
ve0200a.msk
Modificata dicitura fissa per CONAI da stringa a memo per testo piu lungo
Aggiunta gestione w/r ini per memo (testo su piu' righe)

130
cd/test/ve0780a.ini Normal file

@ -0,0 +1,130 @@
[Main]
Demo=0
[ve1]
File(0) = ve0.exe|X
File(7) = ve0200a.msk|X
Patch = 0780
Versione = 21511200
[ve99]
Kill(0) = batbcld.msk|x
Kill(1) = bastspp.rep|x
Kill(2) = basttri.msk|x
Kill(3) = batbeld.msk|x
Kill(4) = ve7700a.msk|x
Kill(5) = batbspt.msk|x
Kill(6) = ve7300a.msk|x
Kill(7) = bastcra.rep|x
Kill(8) = batbfca.msk|x
Kill(9) = bastgcg.rep|x
Kill(10) = bastabe.rep|x
Kill(11) = batbpro.msk|x
Kill(12) = bastgca.msk|x
Kill(13) = ve7400a.msk|x
Kill(14) = batbtag.msk|x
Kill(15) = batbtri.msk|x
Kill(16) = baststd.msk|x
Kill(17) = baststd.rep|x
Kill(18) = batbrfc.msk|x
Kill(19) = ve7200a.msk|x
Kill(20) = batbmre.msk|x
Kill(21) = bastctr.msk|x
Kill(22) = batbcau.msk|x
Kill(23) = ve7400a.ini|x
Kill(24) = basteld.rep|x
Kill(25) = batbrfa.msk|x
Kill(26) = bastcaa.rep|x
Kill(27) = ve7701a.ini|x
Kill(28) = bastfrd.rep|x
Kill(29) = batbgcg.msk|x
Kill(30) = bastums.rep|x
Kill(31) = bastgca.rep|x
Kill(32) = basttri.rep|x
Kill(33) = batbfrr.msk|x
Kill(34) = batbums.msk|x
Kill(35) = bastimb.rep|x
Kill(36) = bastfca.msk|x
Kill(37) = bastfrr.msk|x
Kill(38) = batbbnp.msk|x
Kill(39) = bastasf.msk|x
Kill(40) = bastnum.msk|x
Kill(41) = bastfca.rep|x
Kill(42) = ve7400conf.ini|x
Kill(43) = ve7500a.msk|x
Kill(44) = bastgmc.msk|x
Kill(45) = bastfrm.rep|x
Kill(46) = batbfsa.msk|x
Kill(47) = basttip.rep|x
Kill(48) = batbstd.msk|x
Kill(49) = bastcau.msk|x
Kill(50) = bastrfa.msk|x
Kill(51) = bastnum.rep|x
Kill(52) = bastubi.msk|x
Kill(53) = ve7600a.msk|x
Kill(54) = ve7100a.msk|x
Kill(55) = batbprs.msk|x
Kill(56) = batbspp.msk|x
Kill(57) = batbcaa.msk|x
Kill(58) = bastrfc.msk|x
Kill(59) = bastimb.msk|x
Kill(60) = bastums.msk|x
Kill(61) = batbctr.msk|x
Kill(62) = batbfid.msk|x
Kill(63) = bastspp.msk|x
Kill(64) = batbubi.msk|x
Kill(65) = bastctr.rep|x
Kill(66) = bastubi.rep|x
Kill(67) = basttag.msk|x
Kill(68) = bastcaa.msk|x
Kill(69) = bastfrr.rep|x
Kill(70) = bastcau.rep|x
Kill(71) = batbtip.msk|x
Kill(72) = basteld.msk|x
Kill(73) = bastgcg.msk|x
Kill(74) = ve7200a.frm|x
Kill(75) = bastprs.rep|x
Kill(76) = bastbnp.msk|x
Kill(77) = batbgsa.msk|x
Kill(78) = batbasf.msk|x
Kill(79) = efstbnp.rep|x
Kill(80) = eftbbnp.msk|x
Kill(81) = basttag.rep|x
Kill(82) = batbgca.msk|x
Kill(83) = ve7.exe|x
Kill(84) = ve7300a.frm|x
Kill(85) = batbfrm.msk|x
Kill(86) = bastrfc.rep|x
Kill(87) = batbnum.msk|x
Kill(88) = bastcra.msk|x
Kill(89) = bastfrd.msk|x
Kill(90) = bastprs.msk|x
Kill(91) = batbcra.msk|x
Kill(92) = bastasf.rep|x
Kill(93) = bastabe.msk|x
Kill(94) = batbgmc.msk|x
Kill(95) = bastbnp.rep|x
Kill(96) = efstbnp.msk|x
Kill(97) = batbabe.msk|x
Kill(98) = batbacr.msk|x
Kill(99) = batbimb.msk|x
Kill(100) = batbfrd.msk|x
Kill(101) = batbprv.msk|x
Kill(102) = bastgmc.rep|x
Kill(103) = bastfrm.msk|x
Kill(104) = basttip.msk|x
Kill(105) = bastrfa.rep|x
[ve]
Data = 03-05-2019
Descrizione = Vendite
Dischi = 1
Moduli = ba,cg9,pr9,mg9,sv9,in9,ef9
OEM =
Patch = 780
PostProcess = bainst -0 VE
PreProcess =
Prezzo(1) =
Prezzo(2) =
Versione = 21511200

BIN
cd/test/ve0780a1.zip Normal file

Binary file not shown.

16
cd/test/ve0784.txt Normal file

@ -0,0 +1,16 @@
ve5.exe
ve6.exe
ve0.exe
ve1.exe
ve3200x.msk
cg0200a.msk
cg0100a.msk
cg0.exe
Rifatto il metodo per determinare il numero di partita nella contabilizzazione fatture e nella generazione effetti, ora dovrebbero essere omogenei cioè :
Nel casosia una fattura di acquisto o una nota di credito viene considerato prima il documento di riferimento, se compilato.
Poi vengono utilizzati il numero di documento, il protocollo IVA o il mese a seconda dei flag sul saldaconto.
Ricerca per ragione sociale cliente/fornitore nella stampa LISTINI

144
cd/test/ve0784a.ini Normal file

@ -0,0 +1,144 @@
[Main]
Demo=0
[ve1]
File(0) = ve0.exe|X
File(19) = ve1.exe|X
File(66) = ve3200x.msk|X
File(86) = ve5.exe|X
File(93) = ve6.exe|X
Patch = 784
Versione = 21511200
[ve99]
Kill(0) = batbimb.msk|x
Kill(1) = batbacr.msk|x
Kill(2) = bastfrd.msk|x
Kill(3) = bastbnp.rep|x
Kill(4) = bastcra.msk|x
Kill(5) = batbgmc.msk|x
Kill(6) = batbabe.msk|x
Kill(7) = efstbnp.msk|x
Kill(8) = batbfrm.msk|x
Kill(9) = batbcra.msk|x
Kill(10) = ve7300a.frm|x
Kill(11) = bastprs.msk|x
Kill(12) = batbnum.msk|x
Kill(13) = bastabe.msk|x
Kill(14) = bastrfc.rep|x
Kill(15) = bastasf.rep|x
Kill(16) = basttag.rep|x
Kill(17) = eftbbnp.msk|x
Kill(18) = ve7.exe|x
Kill(19) = batbgca.msk|x
Kill(20) = ve7200a.msk|x
Kill(21) = batbrfa.msk|x
Kill(22) = bastgca.rep|x
Kill(23) = batbrfc.msk|x
Kill(24) = basteld.rep|x
Kill(25) = bastums.rep|x
Kill(26) = ve7701a.ini|x
Kill(27) = batbfrr.msk|x
Kill(28) = bastcaa.rep|x
Kill(29) = basttri.rep|x
Kill(30) = batbtri.msk|x
Kill(31) = bastctr.msk|x
Kill(32) = batbtag.msk|x
Kill(33) = batbmre.msk|x
Kill(34) = baststd.rep|x
Kill(35) = ve7400a.ini|x
Kill(36) = baststd.msk|x
Kill(37) = batbcau.msk|x
Kill(38) = batbpro.msk|x
Kill(39) = bastabe.rep|x
Kill(40) = ve7400a.msk|x
Kill(41) = bastgca.msk|x
Kill(42) = bastimb.msk|x
Kill(43) = bastctr.rep|x
Kill(44) = batbtip.msk|x
Kill(45) = bastrfc.msk|x
Kill(46) = batbubi.msk|x
Kill(47) = bastcau.rep|x
Kill(48) = basttag.msk|x
Kill(49) = bastgcg.msk|x
Kill(50) = bastubi.rep|x
Kill(51) = basteld.msk|x
Kill(52) = bastcau.msk|x
Kill(53) = batbprs.msk|x
Kill(54) = batbctr.msk|x
Kill(55) = batbstd.msk|x
Kill(56) = ve7100a.msk|x
Kill(57) = bastums.msk|x
Kill(58) = batbcaa.msk|x
Kill(59) = bastspp.msk|x
Kill(60) = batbspp.msk|x
Kill(61) = batbfid.msk|x
Kill(62) = bastasf.msk|x
Kill(63) = bastfrm.rep|x
Kill(64) = bastnum.rep|x
Kill(65) = batbbnp.msk|x
Kill(66) = bastgmc.msk|x
Kill(67) = bastrfa.msk|x
Kill(68) = basttip.rep|x
Kill(69) = ve7600a.msk|x
Kill(70) = batbfsa.msk|x
Kill(71) = bastubi.msk|x
Kill(72) = batbgcg.msk|x
Kill(73) = bastimb.rep|x
Kill(74) = bastfca.rep|x
Kill(75) = bastfrd.rep|x
Kill(76) = batbums.msk|x
Kill(77) = bastnum.msk|x
Kill(78) = bastfrr.msk|x
Kill(79) = ve7500a.msk|x
Kill(80) = bastfca.msk|x
Kill(81) = ve7400conf.ini|x
Kill(82) = efstbnp.rep|x
Kill(83) = batbasf.msk|x
Kill(84) = bastfrr.rep|x
Kill(85) = bastprs.rep|x
Kill(86) = bastcaa.msk|x
Kill(87) = ve7200a.frm|x
Kill(88) = batbgsa.msk|x
Kill(89) = bastbnp.msk|x
Kill(90) = bastrfa.rep|x
Kill(91) = basttip.msk|x
Kill(92) = batbprv.msk|x
Kill(93) = batbfrd.msk|x
Kill(94) = bastfrm.msk|x
Kill(95) = bastgmc.rep|x
Kill(96) = bastgcg.rep|x
Kill(97) = batbfca.msk|x
Kill(98) = bastspp.rep|x
Kill(99) = batbcld.msk|x
Kill(100) = batbspt.msk|x
Kill(101) = ve7700a.msk|x
Kill(102) = batbeld.msk|x
Kill(103) = basttri.msk|x
Kill(104) = bastcra.rep|x
Kill(105) = ve7300a.msk|x
[cg9]
Edit_19 = cg0 -0
Edit_20 = cg0 -1
Edit_26 = cg0 -4
Edit_5 = cg0 -5
File(127) = cg0.exe|X
File(128) = cg0100a.msk|X
File(129) = cg0200a.msk|X
Patch = 782
Versione = 21511200
[ve]
Data = 03-05-2019
Descrizione = Vendite
Dischi = 1
Moduli = ba,cg9,pr9,mg9,sv9,in9,ef9
OEM =
Patch = 784
PostProcess = bainst -0 VE
PreProcess =
Prezzo(1) =
Prezzo(2) =
Versione = 21511200

BIN
cd/test/ve0784a1.zip Normal file

Binary file not shown.

69
src/cg/cg2100.cpp

@ -124,13 +124,14 @@ TMask* TPrimanota_application::load_mask(int n)
ism.set_handler(CG_RATEO, sheet_rateo_handler);
ism.set_handler(CG_RISCONTO, sheet_risconto_handler);
if (!is_fp(m))
m->hide(F_PROTFPPRO);
else
{
m->add_button_tool(DLG_LINK, "Fatture SDI", TOOL_ELABORA);
m->set_handler(DLG_LINK, fppro_mask);
m->hide(F_PROTFPPRO);
if(m->find_by_id(DLG_LINK) != NULL)
m->disable(DLG_LINK);
}
else
if (m->find_by_id(DLG_LINK) != NULL)
m->set_handler(DLG_LINK, fppro_mask);
if (_quadratura)
m->set_handler(F_ADJUST_IVA, quadratura_handler);
@ -1572,7 +1573,7 @@ void TPrimanota_application::clean_fppro()
// Controlli: solo in mod modifica; che abbia fp (no F8); che non sono in salvataggio
if (_mode != MODE_MOD
|| !is_fp(&msk)
|| last_key != 127 && last_key != K_SAVE)
|| last_key != K_DEL && last_key != K_SAVE)
return;
const TString& numreg = msk.get(F_NUMREG);
@ -2380,11 +2381,8 @@ int TPrimanota_application::save_fppro()
else return pro_notsaved;
}
// Controllo che sto registrando un documento FA Fattura di Acquisto
TLocalisamfile clifo(LF_CAUSALI);
clifo.setkey(1);
clifo.put("CODCAUS", msk.get(F_CODCAUS));
if (clifo.read() != NOERR || clifo.get("TIPODOC") != "FA")
// Controllo che sto registrando un documento FA Fattura di Acquisto o NC Acquisto
if (!TPro_msk::check_causale(msk.get(F_CODCAUS)))
return pro_notsaved;
if (last != K_SAVE) { // Se sto uscendo avvertimento di non salvataggio e salto
message_box("La registrazione del movimento non verrà salvata sul database.");
@ -2395,48 +2393,25 @@ int TPrimanota_application::save_fppro()
const TDate data_documento(msk.get(F_DATADOC));
const TString& numero_docext = msk.get(F_NUMDOCEXT);
const TString& numero_doc = msk.get(F_NUMDOC);
const TString& codfisc = msk.get(F_COFI);
const TString& codforn = msk.get(F_CODCLIFOR);
const TString& stato_piva = msk.get(F_STATOPAIV);
const TString& piva = msk.get(F_PIVA);
const TString& tot_doc = msk.get(F_TOTALE);
TToken_string fppro_keys(msk.get(F_PROKEY), ';');
const TString& keyprginvio = fppro_keys.get();
const TString& keyheaderfatt = fppro_keys.get();
const TString& keybodyfatt = fppro_keys.get();
TString id_fornitore;
if (!piva.empty())
{
id_fornitore << " (P2_FISCIVAPAESE = ";
if (!stato_piva.empty())
id_fornitore << "\'" << stato_piva << "\'";
else
id_fornitore << "\'IT\'";
id_fornitore << " AND P2_FISCIVACOD = \'" << piva << "\'";
}
if(!codfisc.empty())
{
if (!id_fornitore.empty())
id_fornitore << " OR ";
id_fornitore << " P2_CODFISCALE = \'" << codfisc << "\'";
}
if(!id_fornitore.empty())
id_fornitore << ")";
else
{
error_box("Attenzione non è stata inserita ne la partita iva ne il cod.fisc del fornitore:\nimpossibile associarlo in FPPRO");
return pro_notsaved;
}
TString query;
query << "SELECT PZ_DATA, CAST(P1_DATAORARIC AS DATE) AS P1_DATAORARIC, PQ_IMPTOTDOC, PZ_NUMERO, PZ_NUMREGCONT, P2_FISCIVAPAESE, P2_FISCIVACOD, P2_CODFISCALE, PZ_KEYPRGINVIO, PZ_KEYHEADERFATT, PZ_KEYBODYFATT\n" <<
"FROM PAA0200F\n" << "JOIN FPPRO00F\n" << " ON P2_KEYPRGINVIO = PZ_KEYPRGINVIO AND P2_KEYHEADERFATT = PZ_KEYHEADERFATT AND P2_KEYBODYFATT = PZ_KEYBODYFATT\n" <<
"JOIN PAA0100F\n" << " ON P2_KEYPRGINVIO = P1_KEYPRGINVIO AND P2_KEYHEADERFATT = P1_KEYHEADERFATT AND P2_KEYBODYFATT = P1_KEYBODYFATT\n" <<
"JOIN PAA2700F\n" << "ON P2_KEYPRGINVIO = PQ_KEYPRGINVIO AND P2_KEYHEADERFATT = PQ_KEYHEADERFATT AND P2_KEYBODYFATT = PQ_KEYBODYFATT\n" <<
"WHERE " << id_fornitore << " AND PZ_DATA = \'" << data_documento.date2ansi() << "\' AND PQ_IMPTOTDOC = \'" << tot_doc << "\' AND PZ_NUMERO = \'" << (!numero_docext.empty() ? numero_docext : numero_doc) << "\' ;";
TString where_str;
where_str << " (PZ_DATA = \'" << data_documento.date2ansi() << "\' AND PQ_IMPTOTDOC = \'" << tot_doc << "\' AND PZ_NUMERO = \'" << (!numero_docext.empty() ? numero_docext : numero_doc) << "\') ";
TString& query = TPro_msk::query_fppro(keyprginvio, keyheaderfatt, keybodyfatt, where_str);
fp_db().sq_set_exec(query);
const int n = fp_db().sq_items();
if (n != 1)
{
message_box(TString("Attenzione,") << "al movimento non è stato abbinato nessun documento elettronico.\n" <<
"Per conserntire una corretta archiviazione sostitutiva si consiglia di non confermare la registrazione e di procedere\n" <<
warning_box(TString("Attenzione, ") << "al movimento non è stato abbinato nessun documento elettronico.\n" <<
"Per consentire una corretta archiviazione sostitutiva si consiglia di non confermare la registrazione e di procedere\n" <<
"all'identificazione del fornitore tramite il monitor fatture passive.\n" <<
"In caso di documento escluso dalla fatturazione elettronica ignorate questo messaggio.");
return pro_notsaved;
@ -2456,9 +2431,9 @@ int TPrimanota_application::save_fppro()
return pro_notsaved;
}
const TString keyprginvio = fp_db().sq_get("PZ_KEYPRGINVIO");
/*const TString keyprginvio = fp_db().sq_get("PZ_KEYPRGINVIO");
const TString keyheaderfatt = fp_db().sq_get("PZ_KEYHEADERFATT");
const TString keybodyfatt = fp_db().sq_get("PZ_KEYBODYFATT");
const TString keybodyfatt = fp_db().sq_get("PZ_KEYBODYFATT");*/
const int numregcont = msk.get_int(F_NUMREG);
const int clifor = msk.get_int(F_CODCLIFOR);

40
src/cg/cg2100.h

@ -201,25 +201,31 @@
#define F_COFIS 603
#define F_STATOPAIVS 604
#define F_PIVAS 605
#define F_SHEETFPPROS 606
#define F_RAGSOCS 606
#define F_ENABSEARCH 607
#define F_ENABDATE 608
#define F_DATESEARCH 609
#define F_SHEETFPPROS 610
#define F_NUMEROI 607
#define F_DATAI 608
#define F_TOTDOCI 609
#define F_PROTFPPROI 610
#define F_FPPROKEYSI 611
#define F_SHEET_TEXT 612
#define F_SHOWALL 613
#define F_NUMEROI 611
#define F_DATAI 612
#define F_TOTDOCI 613
#define F_PROTFPPROI 614
#define F_FPPROKEYSI 615
#define F_SHEET_TEXT 616
#define F_SHOWALL 617
#define F_SELFPPROS 101
#define F_DATAORARICS 102
#define F_DATAS 103
#define F_IMPTOTDOCS 104
#define F_NUMEROS 105
#define F_FISCIVAPAESES 106
#define F_FISCIVACODS 107
#define F_CODFISCALES 108
#define F_TIPOPROTS 109
#define F_PROGRESSS 110
#define F_TIPODOCS 102
#define F_DATAORARICS 103
#define F_DATAS 104
#define F_IMPTOTDOCS 105
#define F_NUMEROS 106
#define F_FISCIVAPAESES 107
#define F_FISCIVACODS 108
#define F_CODFISCALES 109
#define F_TIPOPROTS 110
#define F_PROGRESSS 111
#define F_KEYFPPROS 112
#endif

16
src/cg/cg2100c.uml

@ -2,8 +2,22 @@
#include "cg21sld.h"
TOOLBAR "topbar" 0 0 0 2
BUTTON DLG_LINK 2 2
BEGIN
PROMPT 3 1 "Fatture SDI"
PICTURE TOOL_ELABORA
MODULE FP
END
BUTTON DLG_NULL 2 2
BEGIN
PROMPT 1 1 ""
END
#include <relapbar.h>
ENDPAGE
PAGE "Testata" -1 -1 77 20
@ -597,7 +611,7 @@ END
STRING F_PROTFPPRO 18
BEGIN
PROMPT 1 17 "Codice Protocollo FPPRO "
PROMPT 1 18 "Codice Protocollo FPPRO "
FLAGS "D"
END

228
src/cg/cg2102.cpp

@ -2259,6 +2259,24 @@ bool TPrimanota_application::caus_query_handler(TMask_field& f, KEY key)
return true;
}
void TPrimanota_application::check_fppro_fields(TMask& m)
{
if (app().is_fp(&m))
{
if (!TPro_msk::check_causale(m.get(F_CODCAUS)) && m.find_by_id(F_PROTFPPRO) != NULL)
{
m.hide(F_PROTFPPRO);
m.disable(DLG_LINK);
}
else
if (TPro_msk::check_causale(m.get(F_CODCAUS)) && m.find_by_id(F_PROTFPPRO) != NULL && m.field(F_PROTFPPRO).hidden())
{
m.show(F_PROTFPPRO);
m.enable(DLG_LINK);
}
}
}
// Handler of the F_CODCAUS field on the modify mask
// Certified 99%
bool TPrimanota_application::caus_modify_handler(TMask_field& f, KEY key)
@ -2328,7 +2346,7 @@ bool TPrimanota_application::caus_modify_handler(TMask_field& f, KEY key)
m.set(F_RITFATT, app().causale().fattura_in_ritardo() ? "X" : " ");
}
}
check_fppro_fields(f.mask());
return true;
}
@ -3828,7 +3846,7 @@ bool TPrimanota_application::quadratura_handler(TMask_field& f, KEY key)
bool TPrimanota_application::fppro_mask(TMask_field& f, KEY key)
{
TMask& cg_msk = f.mask();
if (!app().get_isfp() || key != K_SPACE && key != K_TAB)
if (!app().get_isfp() || key != K_SPACE && key != K_TAB || !TPro_msk::check_causale(f.mask().get(F_CODCAUS)))
return true;
auto msk = std::make_shared<TPro_msk>(cg_msk);
@ -3863,38 +3881,25 @@ bool TPro_msk::load_fppro_mask(TMask* msk, KEY k)
const int forn = msk->get_int(F_CODCLIFORS);
if (forn == 0)
{
message_box("Inserire prima il fornitore");
return false;
msk->set(F_ENABSEARCH, "X");
abilita_piva(msk);
//message_box("Inserire prima il fornitore");
//return false;
}
const TString& codfisc = msk->get(F_COFIS);
const TString& stato_piva = msk->get(F_STATOPAIVS);
const TString& piva = msk->get(F_PIVAS);
TString id_fornitore;
if (!piva.empty())
{
id_fornitore << " (P2_FISCIVAPAESE = ";
if (!stato_piva.empty())
id_fornitore << "\'" << stato_piva << "\'";
else
id_fornitore << "\'IT\'";
id_fornitore << " AND P2_FISCIVACOD = \'" << piva << "\'";
}
if (!codfisc.empty())
{
if (!id_fornitore.empty())
id_fornitore << " OR ";
id_fornitore << " P2_CODFISCALE = \'" << codfisc << "\'";
}
if (!id_fornitore.empty())
id_fornitore << ")";
TString query;
query << "SELECT PZ_DATA, CAST(P1_DATAORARIC AS DATE) AS P1_DATAORARIC, PQ_IMPTOTDOC, PZ_NUMERO, PZ_NUMREGCONT, PZ_TIPOPROT, PZ_NUMPROT, P2_FISCIVAPAESE, P2_FISCIVACOD, P2_CODFISCALE, PZ_KEYPRGINVIO, PZ_KEYHEADERFATT, PZ_KEYBODYFATT\n" <<
"FROM PAA0200F\n" << "JOIN FPPRO00F\n" << " ON P2_KEYPRGINVIO = PZ_KEYPRGINVIO AND P2_KEYHEADERFATT = PZ_KEYHEADERFATT AND P2_KEYBODYFATT = PZ_KEYBODYFATT\n" <<
"JOIN PAA0100F\n" << " ON P2_KEYPRGINVIO = P1_KEYPRGINVIO AND P2_KEYHEADERFATT = P1_KEYHEADERFATT AND P2_KEYBODYFATT = P1_KEYBODYFATT\n" <<
"JOIN PAA2700F\n" << "ON P2_KEYPRGINVIO = PQ_KEYPRGINVIO AND P2_KEYHEADERFATT = PQ_KEYHEADERFATT AND P2_KEYBODYFATT = PQ_KEYBODYFATT\n" <<
"WHERE " << id_fornitore << "\n" <<
"ORDER BY P1_DATAORARIC ASC;";
TString date = "";
if (msk->get_bool(F_ENABDATE))
date = TDate(msk->get_date(F_DATESEARCH));
if(!msk->get_bool(F_ENABSEARCH))
query = query_fppro(msk->get(F_CODCLIFORS), date);
else
query = query_fppro(stato_piva, piva, date);
fp_db().sq_set_exec(query, false);
TSheet_field& sf = msk->sfield(F_SHEETFPPROS);
@ -3909,6 +3914,7 @@ bool TPro_msk::load_fppro_mask(TMask* msk, KEY k)
continue;
TToken_string& row = sf.row(-1);
row.add("", 0);
row.add(fp_db().sq_get("P7_TIPODOC"));
row.add(TDate(fp_db().sq_get_date("P1_DATAORARIC")));
row.add(TDate(fp_db().sq_get_date("PZ_DATA")));
row.add(fp_db().sq_get("PQ_IMPTOTDOC"));
@ -3918,6 +3924,9 @@ bool TPro_msk::load_fppro_mask(TMask* msk, KEY k)
row.add(fp_db().sq_get("P2_CODFISCALE"));
row.add(fp_db().sq_get("PZ_TIPOPROT"));
row.add(fp_db().sq_get("PZ_NUMPROT"));
TString fppro_keys;
fppro_keys << fp_db().sq_get("PZ_KEYPRGINVIO") << ";" << fp_db().sq_get("PZ_KEYHEADERFATT") << ";" << fp_db().sq_get("PZ_KEYBODYFATT");
row.add(fppro_keys);
}
sf.force_update();
sf.show();
@ -3946,13 +3955,12 @@ bool TPro_msk::fppro_ok_handler(TMask_field& f, KEY k)
{
if(!loaded && *row->get(0) == 'X')
{
msk.set(F_NUMEROI, row->get(4));
msk.set(F_DATAI, row->get(2));
msk.set(F_TOTDOCI, row->get(3));
TString protocollo; protocollo << TDate(row->get(1)).year() << "-" << row->get(8) << "/" << row->get(9);
msk.set(F_NUMEROI, row->get(5));
msk.set(F_DATAI, row->get(3));
msk.set(F_TOTDOCI, row->get(4));
TString protocollo; protocollo << TDate(row->get(2)).year() << "-" << row->get(9) << "/" << row->get(10);
msk.set(F_PROTFPPROI, protocollo);
TString key_prot; key_prot << fp_db().sq_get("PZ_KEYPRGINVIO") << ";" << fp_db().sq_get("PZ_KEYHEADERFATT") << ";" << fp_db().sq_get("PZ_KEYBODYFATT");
msk.set(F_FPPROKEYSI, key_prot);
msk.set(F_FPPROKEYSI, row->get(11));
loaded = true;
ok = true;
break;
@ -3967,6 +3975,43 @@ bool TPro_msk::fppro_ok_handler(TMask_field& f, KEY k)
return true;
}
bool TPro_msk::piva_handler(TMask_field& f, KEY k)
{
TMask& msk = f.mask();
bool ok = true;
if(k == K_TAB && f.active() && f.focusdirty())
{
ok = load_fppro_mask(&msk, 32);
}
return ok;
}
bool TPro_msk::date_handler(TMask_field& f, KEY k)
{
TMask& msk = f.mask();
bool ok = true;
if (k == K_TAB && f.active() && f.focusdirty())
{
ok = load_fppro_mask(&msk, 32);
}
return ok;
}
bool TPro_msk::check_causale(const TString& cod_caus)
{
bool nc = false;
bool nc_acq = false;
bool fa = false;
TCausale caus(cod_caus);
if ((nc = caus.tipo_doc() == "NC"))
nc_acq = caus.reg().tipo() == TIPO_REG_ACQ;
fa = caus.tipo_doc() == "FA";
return fa || nc && nc_acq;
}
void TPro_msk::fppro_selfatt() const
{
const TMask& mask = *this;
@ -3983,21 +4028,130 @@ void TPro_msk::fppro_selfatt() const
bool TPro_msk::on_field_event(TOperable_field& o, TField_event e, long jolly)
{
if (o.dlg() == F_SELFPPROS)
switch (o.dlg())
{
if(e == fe_modify)
case F_SELFPPROS:
if (e == fe_modify)
fppro_selfatt();
break;
case F_SHOWALL:
if (e == fe_modify)
load_fppro_mask(this, 32);
break;
case F_ENABSEARCH:
if (e == fe_modify)
{
abilita_piva(this);
load_fppro_mask(this);
}
break;
case F_ENABDATE:
if (e == fe_modify)
{
field(F_DATESEARCH).show(o.mask().get_bool(F_ENABDATE));
if (!o.mask().get_bool(F_ENABDATE))
load_fppro_mask(this);
}
break;
default:
break;
}
return true;
}
TString& TPro_msk::query_fppro(const TString& keyprginvio, const TString& keyheaderfatt, const TString& keybodyfatt,
const TString& where_str)
{
return query_fppro("", "", "", where_str, "", keyprginvio, keyheaderfatt, keybodyfatt, false, false);
}
TString& TPro_msk::query_fppro(const TString& codforn, const TString& date)
{
return query_fppro(codforn, "", "", "", date, "", "", "", true, false);
}
TString& TPro_msk::query_fppro(const TString& stato_piva, const TString& piva, const TString& date)
{
return query_fppro("", stato_piva, piva, "", date, "", "", "", true, true);
}
TString& TPro_msk::query_fppro(const TString& codforn, const TString& stato_piva, const TString& piva, const TString& where_str, const TString& date, const TString& keyprginvio, const TString& keyheaderfatt, const TString& keybodyfatt, bool order, bool piva_research)
{
TString id_fornitore;
TString keys;
if(piva_research && !piva.empty())
{
id_fornitore << " (P2_FISCIVAPAESE = ";
if (!stato_piva.empty())
id_fornitore << "\'" << stato_piva << "\'";
else
id_fornitore << "\'IT\'";
id_fornitore << " AND P2_FISCIVACOD = \'" << piva << "\') ";
}
else
{
if(codforn.empty() && !keyprginvio.empty() && !keyheaderfatt.empty() && !keybodyfatt.empty())
{
keys << " (PZ_KEYPRGINVIO = '" << keyprginvio << "' AND PZ_KEYHEADERFATT = '" << keyheaderfatt << "' AND PZ_KEYBODYFATT = '" << keybodyfatt << "') ";
}
if(!codforn.empty())
id_fornitore << " (PZ_CLIFOR = '" << codforn << "') ";
}
return true;
static TString query;
query.cut(0) << "SELECT PZ_CLIFOR, PZ_DATA, CAST(P1_DATAORARIC AS DATE) AS P1_DATAORARIC, P7_TIPODOC, PQ_IMPTOTDOC, PZ_NUMERO, PZ_NUMREGCONT, PZ_TIPOPROT, PZ_NUMPROT, P2_FISCIVAPAESE, P2_FISCIVACOD, P2_CODFISCALE, PZ_KEYPRGINVIO, PZ_KEYHEADERFATT, PZ_KEYBODYFATT\n" <<
"FROM PAA0200F\n" << "JOIN FPPRO00F\n" << " ON P2_KEYPRGINVIO = PZ_KEYPRGINVIO AND P2_KEYHEADERFATT = PZ_KEYHEADERFATT AND P2_KEYBODYFATT = PZ_KEYBODYFATT\n" <<
"JOIN PAA0100F\n" << " ON P2_KEYPRGINVIO = P1_KEYPRGINVIO AND P2_KEYHEADERFATT = P1_KEYHEADERFATT AND P2_KEYBODYFATT = P1_KEYBODYFATT\n" <<
"JOIN PAA2700F\n" << "ON P2_KEYPRGINVIO = PQ_KEYPRGINVIO AND P2_KEYHEADERFATT = PQ_KEYHEADERFATT AND P2_KEYBODYFATT = PQ_KEYBODYFATT\n" <<
"JOIN PAA0700F\n" << "ON P7_KEYPRGINVIO = PQ_KEYPRGINVIO AND P7_KEYHEADERFATT = PQ_KEYHEADERFATT AND P7_KEYBODYFATT = PQ_KEYBODYFATT\n" <<
"WHERE ";
if (!id_fornitore.empty())
{
query << id_fornitore << " ";
if (!date.empty())
query << " AND PZ_DATA = '" << TDate(date).date2ansi() << "' ";
if (order)
query << "\nORDER BY P1_DATAORARIC ASC";
query << ";";
}
else if(!keys.empty())
{
query << keys;
if (!where_str.empty())
query << " AND " << where_str;
query << ";";
}
else
query.cut(0);
return query;
}
void TPro_msk::abilita_piva(TMask* msk)
{
if (msk->get_bool(F_ENABSEARCH))
{
msk->enable(F_PIVAS);
msk->enable(F_STATOPAIVS);
}
else
{
msk->enable(F_PIVAS, false);
msk->enable(F_STATOPAIVS, false);
}
}
TPro_msk::TPro_msk(TMask& cg_msk) : TAutomask("cg2fppro"), _parent_mask(cg_msk)
{
TMask::set_handler(DLG_CONFIG, fppro_handler);
TMask::set_handler(DLG_LINK, fppro_ok_handler);
TMask::set_handler(F_PIVAS, piva_handler);
TMask::set_handler(F_DATESEARCH, date_handler);
TMask::set(F_CODCLIFORS, cg_msk.get(F_CODCLIFOR));
TMask::set(F_COFIS, cg_msk.get(F_COFI));
TMask::set(F_STATOPAIVS, cg_msk.get(F_STATOPAIV));
TMask::set(F_PIVAS, cg_msk.get(F_PIVA));
TMask::set(F_RAGSOCS, cg_msk.get(F_RAGSOCCF));
set(F_DATESEARCH, TDate(TODAY));
}

11
src/cg/cg2102.h

@ -35,6 +35,8 @@
#include <automask.h>
#define TIPO_REG_ACQ 2
class TPro_msk;
class TDati_mov_auto;
@ -105,6 +107,7 @@ class TPrimanota_application : public TRelation_application
static bool suspended_handler(TMask_field& f, KEY k);
static bool num_handler(TMask_field& f, KEY key);
static bool caus_query_handler(TMask_field& f, KEY key);
static void check_fppro_fields(TMask& m);
static bool caus_modify_handler(TMask_field& f, KEY key);
static bool datareg_handler(TMask_field& f, KEY key);
static bool datacomp_handler(TMask_field& f, KEY key);
@ -379,13 +382,21 @@ class TPro_msk : public TAutomask
static bool fppro_handler(TMask_field& f, KEY k);
// Bottone riporta doc FPPRO in testata Prima Nota
static bool fppro_ok_handler(TMask_field& f, KEY k);
static bool piva_handler(TMask_field& f, KEY k);
static bool date_handler(TMask_field& f, KEY k);
// Non permette la selezione multipla
void fppro_selfatt() const;
bool on_field_event(TOperable_field& o, TField_event e, long jolly) override;
public:
static TString& query_fppro(const TString& keyprginvio, const TString& keyheaderfatt, const TString& keybodyfatt, const TString& where_str);
static TString& query_fppro(const TString& codforn, const TString& date);
static TString& query_fppro(const TString& stato_piva, const TString& piva, const TString& date);
static TString& query_fppro(const TString& codforn, const TString& stato_piva, const TString& piva, const TString& where_str, const TString& date, const TString& keyprginvio, const TString& keyheaderfatt, const TString& keybodyfatt, bool order = true, bool piva_research = false);
static void abilita_piva(TMask* msk);
//bool is_fp();
// Carica documenti FPPRO sulla maschera
static bool load_fppro_mask(TMask* msk, KEY k = 32);
static bool check_causale(const TString& cod_caus);
TPro_msk() = delete;
TPro_msk(TMask& cg_msk);
};

42
src/cg/cg2FPPRO.uml

@ -49,20 +49,43 @@ BEGIN
FLAGS "D"
END
STRING F_RAGSOCS 50
BEGIN
PROMPT 0 3 "Rag. Soc."
FLAGS "D"
END
BOOLEAN F_ENABSEARCH
BEGIN
PROMPT 0 4 "Effettua ricerca per P.IVA/Disabilita ricerca per cod. Fornitore"
END
BOOLEAN F_ENABDATE
BEGIN
PROMPT 0 5 "Abilita filtro per data"
END
DATE F_DATESEARCH
BEGIN
PROMPT 35 5 "Data documento"
FLAGS "H"
END
TEXT F_SHEET_TEXT
BEGIN
PROMPT 0 4 "@BSelezionare la fattura, quindi premere 'Riporta Dati'"
PROMPT 0 6 "@BSelezionare la fattura, quindi premere 'Riporta Dati'"
END
BOOLEAN F_SHOWALL
BEGIN
PROMPT 0 5 "Mostra anche fatture già registrate"
PROMPT 0 7 "Mostra anche fatture già registrate"
END
SPREADSHEET F_SHEETFPPROS 0 15
BEGIN
PROMPT 0 6 ""
PROMPT 0 8 ""
ITEM " "
ITEM "Tipo Doc@7"
ITEM "Data Ricezione"
ITEM "Data Doc."
ITEM "Importo Totale"
@ -72,6 +95,7 @@ BEGIN
ITEM "Cod. Fiscale"
ITEM "Tipo Protocollo\nin ingresso"
ITEM "Progressivo di ingresso"
ITEM "Chiave FPPRO@80"
END
STRING F_NUMEROI 20
@ -117,6 +141,12 @@ BEGIN
FLAGS ""
END
STRING F_TIPODOCS 4
BEGIN
PROMPT 10 0 "TIPODOC"
FLAGS "D"
END
DATE F_DATAS
BEGIN
PROMPT 1 1 "DATA"
@ -171,6 +201,12 @@ BEGIN
FLAGS "D"
END
STRING F_KEYFPPROS 80
BEGIN
PROMPT 1 10 "CHIAVE FPPRO"
FLAGS "D"
END
ENDPAGE
TOOLBAR "Documento" 0 0 0 2

30
src/cg/cg4301.cpp

@ -1157,8 +1157,8 @@ void TLiquidazione_app::recalc_att(int month, const char* codatt, TAssoc_array &
#ifdef DBG
long nr = _mov->get_long(MOV_NUMREG);
if (nr == 17146)
int i = 1;
if (nr == 97882 || nr == 98707)
int i = 1;
#endif
const int liqmonth = _mov->get_int(MOV_MESELIQ);
@ -1185,8 +1185,8 @@ void TLiquidazione_app::recalc_att(int month, const char* codatt, TAssoc_array &
continue;
}
#ifdef DBG
if (nr == 35363)
int i = 1;
if (nr == 97882 || nr == 98707)
int i = 1;
#endif
const TRectype& rcs = _cur->curr(LF_CAUSALI);
const TDate datareg = _mov->get_date(MOV_DATAREG);
@ -1240,8 +1240,8 @@ void TLiquidazione_app::recalc_att(int month, const char* codatt, TAssoc_array &
TPointer_array pagscatt; // Righe di pagsca interessate
#ifdef DBG
if (nr == 25722 || nr == 27710)
int i = 1;
if (nr == 97882 || nr == 98707)
int i = 1;
#endif
if (fattrit)
@ -1285,7 +1285,7 @@ void TLiquidazione_app::recalc_att(int month, const char* codatt, TAssoc_array &
bool regular_month = orizzonte >= date;
bool first_month = regular_month && date > inizio + 1L;
#ifdef DBG
if (nr == 25722 || nr == 27710)
if (nr == 97882 || nr == 98707)
int i = 1;
#endif
flag_pg_nc = rp.calcola_pagato_periodo(first_month ? botime : inizio + 1L, orizzonte, pg_per, nc_per, &pagscatt) && regular_month;
@ -1553,10 +1553,10 @@ void TLiquidazione_app::recalc_att(int month, const char* codatt, TAssoc_array &
const int tp = clifo.get_int(CLI_ALLEG);
#ifdef DBG
long nr = _mov->get_long(MOV_NUMREG);
long nr = _mov->get_long(MOV_NUMREG);
if (nr >= 35363 && nr <= 35368)
int i = 1;
if (nr == 97882 || nr == 98707)
int i = 1;
#endif
if ((soloiva &&
@ -2850,11 +2850,11 @@ void TLiquidazione_app::recalc_att(int month, const char* codatt, TAssoc_array &
// Somma i vari prorata calcolati per gli anni precedenti
prorata += prorata_precedente1 + prorata_precedente2;
prorata += prorata_diff;
if (!lia.get_bool("B7"))
prorata = ZERO;
acquisti_iva -= prorata; // Rettifica acquisti_iva
fdiffinc_iva_acq -= prorata_diff; // Rettifica acquisti_iva differiti incassati
acquisti_iva -= prorata; // Rettifica acquisti_iva
prorata += prorata_diff;
if (!lia.get_bool("B7"))
prorata = ZERO;
fdiffinc_iva_acq -= prorata_diff; // Rettifica acquisti_iva differiti incassati
}
look_plm(month, codatt, true);

63
src/fp/fplib01.cpp

@ -720,29 +720,7 @@ bool TDoc_fp::get_bank_presentazione(const TDocumento& doc, TString& iban, TStri
found = abi.full() && cab.full();
if (found)
get_bnp_iban(abi, cab, prg, iban);
if (!found) // Se non trovo banca su CFBAN la cerco su CFVEN
{
const TRectype& cfven = doc.clifor().vendite();
abi = cfven.get(CFV_CODABIPR);
cab = cfven.get(CFV_CODCABPR);
found = abi.full() && cab.full();
if (found)
get_bnp_iban(abi, cab, 0, iban);
}
if (found)
istituto = cache().get("%BAN", abi, "S0");
return found;
}
bool TDoc_fp::get_bank_appoggio(const TDocumento& doc, TString& iban, TString& abi, TString& cab,
TString& istituto) const
{
bool found = false;
abi = doc.get(DOC_CODABIA);
cab = doc.get(DOC_CODCABA);
iban = doc.get(DOC_IBAN);
found = iban.full();
if (!found) // Se non trovo banca sul DOC la cerco su CFBAN
else // Se non trovo banca sul DOC la cerco su CFBAN
{
TToken_string key;
key.add("C");
@ -760,11 +738,50 @@ bool TDoc_fp::get_bank_appoggio(const TDocumento& doc, TString& iban, TString& a
get_bnp_iban(abi, cab, -1, iban);
}
}
if(!found) // Se non trovo banca su CFBAN la cerco su CFVEN
{
const TRectype& cfven = doc.clifor().vendite();
abi = cfven.get(CFV_CODABIPR);
cab = cfven.get(CFV_CODCABPR);
found = abi.full() && cab.full();
if (found)
get_bnp_iban(abi, cab, 0, iban);
}
if (found)
istituto = cache().get("%BAN", abi, "S0");
return found;
}
bool TDoc_fp::get_bank_appoggio(const TDocumento& doc, TString& iban, TString& abi, TString& cab,
TString& istituto) const
{
abi = doc.get(DOC_CODABIA);
cab = doc.get(DOC_CODCABA);
iban = doc.get(DOC_IBAN);
bool found = abi.full() && cab.full();
if (found)
istituto = cache().get("%BAN", abi, "S0");
if(iban.empty())
{
TToken_string key;
key.add("C");
key.add(doc.codcf());
key.add("V");
key.add(1);
const TRectype& cfban = cache().get(LF_CFBAN, key);
if (!cfban.empty())
{
const TString& abi_cf = cfban.get(CFBAN_ABI);
const TString& cab_cf = cfban.get(CFBAN_CAB);
const bool found_cf = abi_cf.full() && cab_cf.full();
iban = cfban.get(CFBAN_IBAN);
if (found_cf && iban.blank())
get_bnp_iban(abi_cf, cab_cf, -1, iban);
}
}
return found;
}
const TString& TDoc_fp::descrizione(const TRiga_documento& rdoc)
{
if (rdoc.get_bool(RDOC_DESCLUNGA))

4
src/include/campo.aut

@ -47,4 +47,6 @@ bs Bee Store
ha Hardy Caffè
ri Riclassificazioni
gv Gestione versamenti
tf Trasferimento Fatture
tf Trasferimento Fatture
f1 Contabilizzazione Fatture Passive Elettroniche
f9 Archiviazione Sostitutiva

13
src/include/codeb.c

@ -442,8 +442,10 @@ int DB_rewrite(int handle)
if (rt == 0)
rt = DB_flush(handle);
rt = DB_unlock(handle);
return (rt);
const int rt1 = DB_unlock(handle);
return (rt == 0 ? rt1: rt);
}
@ -481,7 +483,12 @@ int DB_add(int handle)
{
if (rt == 0)
rt = DB_flush(handle);
}
const int rt1 = DB_unlock(handle);
if (rt == 0)
rt = rt1;
}
}
return rt;

66
src/include/config.cpp

@ -895,6 +895,7 @@ TConfig::~TConfig()
#define DECLARE_VARNAME(name, idx) const char* varname = idx >= 0 ? (const char*)(get_tmp_string() << name << '(' << idx << ')') : name
#define DECLARE_FILENAME(cfg) TFilename filename; cfg2file(cfg, filename)
#define STOP_LINE "FERMATioSTREGA"
const TString& ini_get_string(const char* file, const char* paragraph, const char* name, const char* defval, int idx)
{
@ -916,6 +917,53 @@ const TString& ini_get_string(const char* file, const char* paragraph, const cha
return tmp;
}
const TString& ini_get_line_memo(const char* file, const char* para, const char* name, int idx)
{
return ini_get_string(file, para, name, STOP_LINE, idx);
}
void ini_del_memo(const char* file, const char* para, const char* name)
{
for (int i = 0; i < ini_get_rows_memo(file, para, name); i++)
ini_remove(file, para, name, i);
}
int ini_get_rows_memo(const char* file, const char* para, const char* name)
{
int idx = 0;
for (TString row = ini_get_line_memo(file, para, name, idx); row != STOP_LINE; row = ini_get_line_memo(file, para, name, idx))
idx++;
return idx;
}
const TString& ini_get_memo(const char* file, const char* para, const char* name)
{
static TString msg; msg.cut(0);
const int rows = ini_get_rows_memo(file, para, name);
for(int i=0; i < rows; i++)
{
TString row = ini_get_line_memo(file, para, name, i);
if (i > 0)
msg << '\n';
msg << row;
}
return msg;
}
void ini_set_memo(const char* file, const char* para, const char* name, const char* msg)
{
// Rimuovo tutte le precedenti righe per non rischiare di lasciarmi vecchie righe indietro (le nuove righe sono meno di prima)
const int rows = ini_get_rows_memo(file, para, name);
for(int i=0; i < rows; i++)
ini_remove(file, para, name, i);
if (!TString(msg).empty())
{
TToken_string msg_tok(msg, '\n');
for (int i = 0; i < msg_tok.items(); i++)
ini_set_string(file, para, name, msg_tok.get(), i);
}
}
bool ini_set_string(const char* file, const char* paragraph, const char* name, const char* val, int idx)
{
DECLARE_VARNAME(name, idx);
@ -976,6 +1024,12 @@ bool ini_remove(int cfg, const char* para, const char* name, int idx)
return ini_remove(filename, para, name, idx);
}
const TString& ini_get_memo(int cfg, const char* para, const char* name)
{
DECLARE_FILENAME(cfg);
return ini_get_memo(filename, para, name);
}
int ini_get_int(int cfg, const char* paragraph, const char* name, int defval, int idx)
{
DECLARE_FILENAME(cfg);
@ -994,6 +1048,18 @@ bool ini_set_bool(int cfg, const char* paragraph, const char* name, bool val, in
return ini_set_string(filename, paragraph, name, val ? "1" : "0", idx);
}
void ini_set_memo(int cfg, const char* para, const char* name, const char* msg)
{
DECLARE_FILENAME(cfg);
ini_set_memo(filename, para, name, msg);
}
void ini_del_memo(int cfg, const char* para, const char* name)
{
DECLARE_FILENAME(cfg);
ini_del_memo(filename, para, name);
}
const TString& get_oem_info(const char* varname, const char* def)
{
TString& tmp = get_tmp_string(50);

9
src/include/config.h

@ -192,6 +192,12 @@ bool ini_set_bool (const char* file, const char* para, const char* na
bool ini_set_int (const char* file, const char* para, const char* name, int val, int idx = -1);
bool ini_set_string(const char* file, const char* para, const char* name, const char* val, int idx = -1);
bool ini_remove (const char* file, const char* para, const char* name, int idx = -1);
const TString& ini_get_memo (const char* file, const char* para, const char* name);
void ini_set_memo (const char* file, const char* paragraph, const char* name, const char* msg);
int ini_get_rows_memo(const char* file, const char* paragraph, const char* name);
const TString& ini_get_line_memo(const char* file, const char* paragraph, const char* name, int idx);
void ini_del_memo (const char* file, const char* para, const char* name);
// High level utilities
bool ini_get_bool (int cfg, const char* para, const char* name, bool defval = false, int idx = -1);
int ini_get_int (int cfg, const char* para, const char* name, int defval = 0, int idx = -1);
@ -200,6 +206,9 @@ bool ini_set_bool (int cfg, const char* para, const char* name, bool
bool ini_set_int (int cfg, const char* para, const char* name, int val, int idx = -1);
bool ini_set_string(int cfg, const char* para, const char* name, const char* val, int idx = -1);
bool ini_remove (int cfg, const char* para, const char* name, int idx = -1);
const TString& ini_get_memo (int cfg, const char* para, const char* name);
void ini_set_memo (int cfg, const char* para, const char* name, const char* msg);
void ini_del_memo (int cfg, const char* para, const char* name);
const TString& get_oem_info(const char* varname, const char* defval = ""); // ini_get_string(CONFIG_OEM, "OEM_?", varname, defval);
bool is_aga_version(bool power_user_only = false);

4
src/include/modaut.h

@ -51,7 +51,9 @@
#define VDAUT 48
#define GVAUT 49
#define TFAUT 50
#define ENDAUT 51
#define F1AUT 51
#define F9AUT 52
#define ENDAUT 52
// Moduli disabilitati

4
src/or/or1100a.h

@ -58,6 +58,10 @@
#define F_OPZ_RESIDUO 158
#define F_OPZ_GIACENZA 159
#define F_FORCE_EVASE 160
#define F_DESFROM 161
#define F_DESTO 162
#define F_DESAGEFROM 163
#define F_DESAGETO 164
#define GR_CLIFO 1
#define GR_NUM 2

108
src/or/or1100a.uml

@ -108,7 +108,7 @@ BEGIN
GROUP GR_DATA
END
GROUPBOX DLG_NULL 30 4
GROUPBOX DLG_NULL 73 5
BEGIN
PROMPT 2 7 "Cliente"
GROUP GR_CLIFO
@ -131,24 +131,52 @@ BEGIN
DISPLAY "Codice@6R" CODCF
DISPLAY "Ragione sociale@50" RAGSOC
OUTPUT F_CFFROM CODCF
OUTPUT F_DESFROM RAGSOC
CHECKTYPE NORMAL
GROUP GR_TUTTI GR_CLIFO
END
STRING F_DESFROM 50
BEGIN
PROMPT 18 9 ""
USE LF_CLIFO KEY 2
INPUT TIPOCF F_TIPOCF SELECT
INPUT RAGSOC F_CFFROM
DISPLAY "Ragione sociale@70" RAGSOC
DISPLAY "Codice@6R" CODCF
COPY OUTPUT F_CFFROM
CHECKTYPE NORMAL
GROUP GR_TUTTI GR_CLIFO
END
NUMBER F_CFTO 6
BEGIN
PROMPT 19 9 "Al "
PROMPT 3 10 "Al "
USE LF_CLIFO KEY 1
INPUT TIPOCF F_TIPOCF SELECT
INPUT CODCF F_CFTO
DISPLAY "Codice@6R" CODCF
DISPLAY "Ragione sociale@50" RAGSOC
OUTPUT F_CFTO CODCF
OUTPUT F_DESTO RAGSOC
CHECKTYPE NORMAL
GROUP GR_TUTTI GR_CLIFO
END
GROUPBOX DLG_NULL 30 4
STRING F_DESTO 50
BEGIN
PROMPT 18 10 ""
USE LF_CLIFO KEY 2
INPUT TIPOCF F_TIPOCF SELECT
INPUT RAGSOC F_DESTO
DISPLAY "Ragione sociale@70" RAGSOC
DISPLAY "Codice@6R" CODCF
COPY OUTPUT F_CFTO
CHECKTYPE NORMAL
GROUP GR_TUTTI GR_CLIFO
END
GROUPBOX DLG_NULL 73 4
BEGIN
PROMPT 2 7 "Agente"
GROUP GR_TUTTI GR_AGE
@ -156,58 +184,86 @@ END
STRING F_AGEFROM 6
BEGIN
PROMPT 3 8 "Dal "
PROMPT 3 8 "Dal "
FLAGS "U"
USE LF_AGENTI
INPUT CODAGE F_AGEFROM
DISPLAY "Codice" CODAGE
DISPLAY "Descr@50" RAGSOC
OUTPUT F_AGEFROM CODAGE
OUTPUT F_DESAGEFROM RAGSOC
GROUP GR_TUTTI GR_AGE
END
STRING F_DESAGEFROM 50
BEGIN
PROMPT 18 8 ""
USE LF_AGENTI KEY 2
INPUT RAGSOC F_DESAGEFROM
DISPLAY "Ragione sociale@70" RAGSOC
DISPLAY "Codice@6R" CODAGE
COPY OUTPUT F_AGEFROM
CHECKTYPE NORMAL
GROUP GR_TUTTI GR_AGE
END
STRING F_AGETO 6
BEGIN
PROMPT 3 9 "Al "
PROMPT 3 9 "Al "
FLAGS "U"
COPY USE F_AGEFROM
INPUT CODAGE F_AGETO
COPY DISPLAY F_AGEFROM
OUTPUT F_AGETO CODAGE
OUTPUT F_DESAGETO RAGSOC
GROUP GR_TUTTI GR_AGE
END
GROUPBOX DLG_NULL 40 4
STRING F_DESAGETO 50
BEGIN
PROMPT 35 7 "Data consegna"
PROMPT 18 9 ""
COPY USE F_DESAGEFROM
INPUT RAGSOC F_DESAGETO
DISPLAY "Ragione sociale@70" RAGSOC
DISPLAY "Codice@6R" CODAGE
COPY OUTPUT F_AGETO
CHECKTYPE NORMAL
GROUP GR_TUTTI GR_AGE
END
GROUPBOX DLG_NULL 30 4
BEGIN
PROMPT 2 12 "Data consegna"
END
DATE F_CONSFROM
BEGIN
PROMPT 36 8 "Dal "
PROMPT 3 13 "Dal "
FLAGS "B"
END
DATE F_CONSTO
BEGIN
PROMPT 36 9 "Al "
PROMPT 3 14 "Al "
FLAGS "B"
END
BOOLEAN F_DETTAGLIO
BEGIN
PROMPT 3 11 "Dettaglio righe"
PROMPT 37 13 "Dettaglio righe"
END
BOOLEAN F_DETAIL_BY_CLI
BEGIN
PROMPT 37 11 "Ordina per cliente"
PROMPT 37 14 "Ordina per cliente"
FLAGS "D"
GROUP GR_TUTTI
END
LIST F_STATOORD 6
BEGIN
PROMPT 3 12 "Tipo ordini "
PROMPT 3 16 "Tipo ordini "
ITEM "T|Tutti"
ITEM "E|Evasi"
ITEM "A|Aperti"
@ -215,7 +271,7 @@ END
BOOLEAN F_DETAIL_BY_DOC
BEGIN
PROMPT 37 12 "Dettaglio per documento"
PROMPT 37 16 "Dettaglio per documento"
// FLAGS "D"
// MESSAGE TRUE DISABLE,GR_DETAILART@
// MESSAGE FALSE ENABLE,GR_DETAILART@
@ -224,7 +280,7 @@ END
LIST F_STATORORD 6
BEGIN
PROMPT 3 13 "Tipo righe ordini "
PROMPT 3 17 "Tipo righe ordini "
FLAGS "D"
GROUP GR_DETAIL
ITEM "T|Tutte"
@ -237,7 +293,7 @@ END
NUMBER F_DETAIL_LEV 1
BEGIN
PROMPT 37 13 "Livello dettaglio "
PROMPT 37 17 "Livello dettaglio "
FLAGS "D"
GROUP GR_DETAILART
USE FCG
@ -250,13 +306,13 @@ END
BOOLEAN F_FORCE_EVASE
BEGIN
PROMPT 3 14 "Stampa righe evase con residuo"
PROMPT 3 18 "Stampa righe evase con residuo"
FLAGS "D"
END
LIST F_RAGG_PER_ART 12
BEGIN
PROMPT 37 14 "Periodo raggruppamento "
PROMPT 37 18 "Periodo raggruppamento "
ITEM "0|Giornaliero"
ITEM "1|1 mese"
ITEM "2|2 mesi"
@ -268,12 +324,12 @@ END
GROUPBOX DLG_NULL 30 4
BEGIN
PROMPT 2 15 "Articolo"
PROMPT 2 19 "Articolo"
END
STRING F_ARTFROM 20
BEGIN
PROMPT 3 16 "Dal "
PROMPT 3 20 "Dal "
FLAGS "DU"
USE LF_ANAMAG
INPUT CODART F_ARTFROM
@ -286,7 +342,7 @@ END
STRING F_ARTTO 20
BEGIN
PROMPT 3 17 "Al "
PROMPT 3 21 "Al "
FLAGS "DU"
USE LF_ANAMAG
INPUT CODART F_ARTTO
@ -299,38 +355,38 @@ END
BOOLEAN F_DETAIL_MAG
BEGIN
PROMPT 37 16 "Dettaglia magazzini"
PROMPT 37 20 "Dettaglia magazzini"
FLAGS "D"
GROUP GR_DETAILART
END
BOOLEAN F_DETAIL_DEP
BEGIN
PROMPT 37 17 "Dettaglia depositi"
PROMPT 37 21 "Dettaglia depositi"
FLAGS "D"
GROUP GR_DETAILART
END
BOOLEAN F_OPZ_VALORE
BEGIN
PROMPT 3 19 "Visualizza colonne valori"
PROMPT 3 23 "Visualizza colonne valori"
END
BOOLEAN F_OPZ_PREZZO
BEGIN
PROMPT 3 20 "Visualizza colonna prezzo"
PROMPT 3 24 "Visualizza colonna prezzo"
GROUP GR_DETAIL GR_ART
END
BOOLEAN F_OPZ_RESIDUO
BEGIN
PROMPT 37 19 "Visualizza colonna residuo"
PROMPT 37 23 "Visualizza colonna residuo"
GROUP GR_DETAIL GR_ART
END
BOOLEAN F_OPZ_GIACENZA
BEGIN
PROMPT 37 20 "Visualizza colonna giacenza"
PROMPT 37 24 "Visualizza colonna giacenza"
GROUP GR_DETAIL GR_ART
END

24
src/ve/ve0200.cpp

@ -15,6 +15,8 @@ class TConf_vendite : public TConfig_application
static bool check_fields(TMask_field& f, KEY k);
static bool check_fields_iva(TMask_field& f, KEY k);
bool load_conai_ini(TMask& mask);
bool save_conai_ini(TMask& mask);
virtual const char * extra_modules() const {return "dt";}
@ -64,13 +66,29 @@ bool TConf_vendite::check_fields_iva(TMask_field& f, KEY k)
return TRUE;
}
bool TConf_vendite::load_conai_ini(TMask& mask)
{
TString msg = ini_get_memo(CONFIG_DITTA, "ve", "DESCCONAIASS");
mask.set(F_DESCONAIASS, !msg.empty()? msg : "");
return true;
}
bool TConf_vendite::save_conai_ini(TMask& mask)
{
TString msg = mask.get(F_DESCONAIASS);
ini_set_memo(CONFIG_DITTA, "ve", "DESCCONAIASS", msg);
return true;
}
bool TConf_vendite::preprocess_config (TMask& mask, TConfig& config)
{
disable_menu_item(M_FILE_NEW);
switch (_current)
{
case 1:
load_conai_ini(mask);
break;
case 5: // solo per configurazione "e"
{
TToken_string ric(config.get("RICERCACR"));
@ -153,7 +171,9 @@ bool TConf_vendite::postprocess_config (TMask& mask, TConfig& config)
switch (_current)
{
case 1:
save_conai_ini(mask);
break;
case 5: // solo per configurazione "e"
{
TToken_string ric;

4
src/ve/ve0200a.uml

@ -466,11 +466,9 @@ BEGIN
PROMPT 2 15 "@bMessaggio alternativo a 'CONTRIBUTO CONAI ASSOLTO'"
END
STRING F_DESCONAIASS 50
ZOOM F_DESCONAIASS 110 50
BEGIN
PROMPT 2 16 ""
FIELD DESCCONAIASS
GROUP 7
END
BOOLEAN F_ESPONIESENTI

1
src/ve/ve3200x.h

@ -49,3 +49,4 @@
#define F_DFLT_G_C 153
#define F_AFLT_G_C 154
#define F_DESCR 155

16
src/ve/ve3200x.uml

@ -122,10 +122,26 @@ BEGIN
DISPLAY "Descrizione@50" DESCR
OUTPUT F_TIPO TIPO
OUTPUT F_O_COD COD
OUTPUT F_DESCR DESCR
CHECKTYPE NORMAL
WARNING "Codice offerta inesistente"
END
STRING F_DESCR 50 30
BEGIN
PROMPT 25 3 ""
USE LF_CONDV KEY 2
INPUT TIPO F_TIPO SELECT
INPUT DESCR F_DESCR
DISPLAY "Descrizione@50" DESCR
DISPLAY "Codice" COD
OUTPUT F_TIPO TIPO
OUTPUT F_L_COD COD
OUTPUT F_C_COD COD
OUTPUT F_O_COD COD
OUTPUT F_DESCR DESCR
END
LIST F_TIPORIGHE 9 // listbox per tipo di selezione righe
BEGIN
PROMPT 2 4 "Righe "

117
src/ve/velib04b.cpp

@ -534,7 +534,9 @@ static TBill _spin_billa, _spin_billv,
static TBill _co_cliente, // conto clifo per movimento d'anticipo
_co_controp; // conto di contropartita per il movimetno d'anticipo
static bool _nump_cfg; // se true prende il numero rif. partita dal numero protocollo
static bool _numpart_pro; // se true prende il numero rif. partita dal numero protocollo
static bool _numpart_mon; // se true prende il numero rif. partita dal mese
static char _part_type; // tipi di numero partita "D" codcumento, "P" protocollo IVA, "M" Mese
static bool _sc_enabled; // se true il saldaconto di ditta è abilitato
static bool _in_enabled; // se true l'intra è abilitato
static TToken_string* _search_seq = NULL;
@ -855,7 +857,12 @@ bool TContabilizzazione::load_parameters()
_sc_enabled = conf.get_bool("GesSal","cg");
_in_enabled = dongle().active(INAUT);
_nump_cfg = conf.get_bool("RifPro","cg");
_numpart_pro = conf.get_bool("RifPro", "cg");
_numpart_mon = conf.get_bool("RifMonth", "cg");
_part_type = 'D';
if (_numpart_pro) _part_type = 'P';
else
if (_numpart_mon) _part_type = 'M';
int gr,co;
long so;
@ -2691,64 +2698,68 @@ error_type TContabilizzazione::write_scadenze(TDocumento& doc, bool recontabiliz
pa.rewrite();
}
int anno = head.get_int(MOV_ANNOIVA);
TString8 numpart; // Max. 7 chars
if (_nump_cfg)
// int anno = head.get_int(MOV_ANNOIVA);
int anno = 0;
TString8 numpart; // Max. 7 chars
if (doc.get(DOC_TIPOCF) == "F" || is_nc)
{
numpart = head.get(MOV_PROTIVA);
if (is_nc)
{
int annorif = doc.get_int("ANNORIF");
if (annorif <= 0)
{
const TDate ddr = doc.get_date(DOC_DATADOCRIF);
annorif = ddr.year();
if (annorif <= 0)
annorif = anno;
}
TString4 codnumrif = doc.get("CODNUMRIF");
if (codnumrif.blank())
codnumrif = doc.get(DOC_CODNUM);
anno = doc.get_int(DOC_ANNORIF);
numpart = doc.get(DOC_NUMDOCRIF);
const TString8 numdocrif = doc.get(DOC_NUMDOCRIF);
if (numdocrif.full())
{
TToken_string keydoc;
keydoc.add(doc.get(DOC_PROVV));
keydoc.add(annorif);
keydoc.add(codnumrif);
keydoc.add(numdocrif);
const long numreg = atol(cache().get(LF_DOC, keydoc, DOC_NUMREG));
if (numreg > 0)
{
TPartite_array pa; pa.add_numreg(numreg);
const TPartita* game = pa.first();
if (game != NULL)
{
anno = game->anno();
numpart = game->numero();
}
}
}
}
}
else
if (numpart.full())
{
numpart = doc.get(DOC_NUMDOCRIF);
if (_caus->iva() == iva_vendite && !is_nc)
numpart.cut(0);
TString4 codnum = doc.get(DOC_CODNUMRIF);
TToken_string keydoc;
if (numpart.blank())
numpart = head.get(MOV_NUMDOC);
else
if (codnum.blank())
codnum = doc.get(DOC_CODNUM);
if (anno <= 0)
{
const TDate ddr = doc.get_date(DOC_DATADOCRIF);
anno = ddr.year();
}
keydoc.add(doc.get(DOC_PROVV));
keydoc.add(anno);
keydoc.add(codnum);
keydoc.add(numpart);
const long numreg = atol(cache().get(LF_DOC, keydoc, DOC_NUMREG));
if (numreg > 0)
{
TPartite_array pa; pa.add_numreg(numreg);
const TPartita* game = pa.first();
if (game != NULL)
{
const TDate ddr = doc.get_date(DOC_DATADOCRIF);
if (ddr.ok())
anno = ddr.year();
anno = game->anno();
numpart = game->numero();
}
}
}
}
if (anno <= 0 || numpart.blank())
{
switch (_part_type)
{
case 'P':
anno = head.get_int(MOV_ANNOES);
numpart = head.get(MOV_PROTIVA);
break;
case 'M':
anno = doc.get_int(DOC_ANNO);
numpart = format("%02d", doc.get_date(DOC_DATADOC).month());
break;
case 'D':
default:
anno = doc.get_int(DOC_ANNO);
numpart = doc.get(DOC_NDOC);
break;
}
}
TPartita* newgame = NULL;
if (anno > 0 && numpart.full())
{

211
src/ve/velib04c.cpp

@ -359,13 +359,15 @@ long TGenerazione_effetti::group_bills(TAssoc_array& group_array, bool interatti
const real change = doc.cambio();
const TDate datafatt = doc.get_date(DOC_DATADOC);
const bool is_nota_credito = doc.is_nota_credito();
long numdocrif = doc.get_long(DOC_NUMDOCRIF);
int annodocrif = doc.get_date(DOC_DATADOCRIF).year();
if (numdocrif > 0L && doc.get_char(DOC_TIPOCF) == 'C' && !doc.tipo().nota_credito())
{
annodocrif = 0;
numdocrif = 0L;
}
TString8 numdocrif = doc.get(DOC_NUMDOCRIF);
long lnumdocrif = doc.get_long(DOC_NUMDOCRIF);
int annodocrif = doc.get_date(DOC_DATADOCRIF).year();
if (numdocrif.full() && doc.get_char(DOC_TIPOCF) == 'C' && !doc.tipo().nota_credito())
{
annodocrif = 0;
numdocrif = 0L;
}
// Qui il controllo sul residuo da pagare per il documento corrente non va effettuato,
// proprio perchè si sta effettuando un raggruppamento di effetti; eventuali documenti
@ -442,7 +444,7 @@ long TGenerazione_effetti::group_bills(TAssoc_array& group_array, bool interatti
{
const int annoeff = effetto.row_r(r).get_int(REFF_ANNODOC);
const long codeff = effetto.row_r(r).get_long(REFF_NFATT);
if (annoeff == annodocrif && codeff == numdocrif)
if (annoeff == annodocrif && codeff == lnumdocrif)
break;
}
if (r <= rows) // Se l'ha trovata ...
@ -502,14 +504,88 @@ long TGenerazione_effetti::group_bills(TAssoc_array& group_array, bool interatti
riga.put(REFF_NFATT,numdoc);
riga.put(REFF_IMPFATT,totale_fatt.get_num());
riga.put(REFF_IMPORTO,imprata);
riga.put(REFF_ANNO, annodocrif);
TString8 numpart; // Max. 7 chars
int anno = 0;
const bool is_nota_credito = doc.tipo().nota_credito();
const bool numpart_pro = ini_get_bool(CONFIG_DITTA, "cg", "RifPro");
const bool numpart_mon = ini_get_bool(CONFIG_DITTA, "cg", "RifMonth");
char part_type = 'D';
const TString4 npart_type = ini_get_string(CONFIG_DITTA, "cg", "RifPro");
if (numpart_pro)
part_type = 'P';
else
if (numpart_mon)
part_type = 'M';
if (npart_type == "M" && effetto.get(EFF_TIPOCF) == "C")
riga.put(REFF_NUMPART, format("%02d", datafatt.month()));
else
riga.put(REFF_NUMPART, numdocrif);
if (doc.get(DOC_TIPOCF) == "F" || is_nota_credito)
{
anno = doc.get_int(DOC_ANNORIF);
numpart = doc.get(DOC_NUMDOCRIF); // Max. 7 chars
if (numpart.full())
{
TString4 codnum = doc.get(DOC_CODNUMRIF);
TToken_string keydoc;
if (codnum.blank())
codnum = doc.get(DOC_CODNUM);
if (anno <= 0)
{
const TDate ddr = doc.get_date(DOC_DATADOCRIF);
anno = ddr.year();
}
keydoc.add(doc.get(DOC_PROVV));
keydoc.add(anno);
keydoc.add(codnum);
keydoc.add(numpart);
const long numreg = atol(cache().get(LF_DOC, keydoc, DOC_NUMREG));
if (numreg > 0)
{
TPartite_array pa; pa.add_numreg(numreg);
const TPartita* game = pa.first();
if (game != NULL)
{
anno = game->anno();
numpart = game->numero();
}
}
}
}
if (anno <= 0 || numpart.blank())
{
switch (part_type)
{
case 'P':
{
const TRectype & mov = cache().get(LF_MOV, doc.get_long(DOC_NUMREG));
anno = mov.get_int(MOV_ANNOES);
numpart = mov.get(MOV_PROTIVA);
if (numpart.blank())
{
anno = doc.get_int(DOC_ANNO);
numpart = doc.get(DOC_NDOC);
}
}
break;
case 'M':
anno = doc.get_int(DOC_ANNO);
numpart = format("%02d", doc.get_date(DOC_DATADOC).month());
break;
case 'D':
default:
anno = doc.get_int(DOC_ANNO);
numpart = doc.get(DOC_NDOC);
break;
}
}
riga.put(REFF_ANNO, anno);
riga.put(REFF_NUMPART, numpart);
if (valuta)
{
riga.put(REFF_IMPFATTVAL,totale_fatt.get_num());
@ -696,11 +772,12 @@ void TGenerazione_effetti::generate_bill(TDocumento& doc, bool interattivo) // b
effetto.put(EFF_CODABI,codabi);
effetto.put(EFF_CODCAB,codcab);
effetto.put(EFF_IBAN,iban);
effetto.put(EFF_CUP,doc.get(DOC_CUP));
effetto.put(EFF_CIG,doc.get(DOC_CIG));
effetto.put(EFF_CONTSEP,doc.get(DOC_CONTSEP));
effetto.put(EFF_CUP,doc.get(DOC_CUP));
effetto.put(EFF_CIG,doc.get(DOC_CIG));
effetto.put(EFF_CONTSEP,doc.get(DOC_CONTSEP));
effetto.put(EFF_EFFCOMP,TRUE);
if (i == numrate - 1) effetto.put(EFF_ULTRATA,TRUE);
if (i == numrate - 1)
effetto.put(EFF_ULTRATA,true);
// Put sulla riga dell'effetto
reffetto.put(REFF_NPROGTR,nprog);
reffetto.put(REFF_NRIGATR,1);
@ -710,26 +787,88 @@ void TGenerazione_effetti::generate_bill(TDocumento& doc, bool interattivo) // b
reffetto.put(REFF_ANNODOC,anno);
reffetto.put(REFF_CODNUM,codnum);
reffetto.put(REFF_NFATT,nfatt);
if (doc.get_char(DOC_TIPOCF) == 'F' || doc.tipo().nota_credito())
TString8 numpart; // Max. 7 chars
int anno = 0;
const bool is_nota_credito = doc.tipo().nota_credito();
const bool numpart_pro = ini_get_bool(CONFIG_DITTA, "cg", "RifPro");
const bool numpart_mon = ini_get_bool(CONFIG_DITTA, "cg", "RifMonth");
char part_type = 'D';
if (numpart_pro)
part_type = 'P';
else
if (numpart_mon)
part_type = 'M';
if (doc.get(DOC_TIPOCF) == "F" || is_nota_credito)
{
reffetto.put(REFF_ANNO, doc.get_date(DOC_DATADOCRIF).year());
reffetto.put(REFF_NUMPART, doc.get(DOC_NUMDOCRIF));
anno = doc.get_int(DOC_ANNORIF);
numpart = doc.get(DOC_NUMDOCRIF); // Max. 7 chars
if (numpart.full())
{
TString4 codnum = doc.get(DOC_CODNUMRIF);
TToken_string keydoc;
if (codnum.blank())
codnum = doc.get(DOC_CODNUM);
if (anno <= 0)
{
const TDate ddr = doc.get_date(DOC_DATADOCRIF);
anno = ddr.year();
}
keydoc.add(doc.get(DOC_PROVV));
keydoc.add(anno);
keydoc.add(codnum);
keydoc.add(numpart);
const long numreg = atol(cache().get(LF_DOC, keydoc, DOC_NUMREG));
if (numreg > 0)
{
TPartite_array pa; pa.add_numreg(numreg);
const TPartita* game = pa.first();
if (game != NULL)
{
anno = game->anno();
numpart = game->numero();
}
}
}
}
else
{
const TString4 npart_type = ini_get_string(CONFIG_DITTA, "cg", "RifPro");
if (npart_type == "M" && effetto.get(EFF_TIPOCF) == "C")
{
reffetto.put(REFF_ANNO, datafatt.year());
reffetto.put(REFF_NUMPART, format("%02d", datafatt.month()));
}
else
{
reffetto.put(REFF_ANNO, doc.get_date(DOC_DATADOCRIF).year());
reffetto.put(REFF_NUMPART, doc.get(DOC_NUMDOCRIF));
}
}
if (anno <= 0 || numpart.blank())
{
switch (part_type)
{
case 'P':
{
const TRectype & mov = cache().get(LF_MOV, doc.get_long(DOC_NUMREG));
anno = mov.get_int(MOV_ANNOES);
numpart = mov.get(MOV_PROTIVA);
if (numpart.blank())
{
anno = doc.get_int(DOC_ANNO);
numpart = doc.get(DOC_NDOC);
}
}
break;
case 'M':
anno = doc.get_int(DOC_ANNO);
numpart = format("%02d", doc.get_date(DOC_DATADOC).month());
break;
case 'D':
default:
anno = doc.get_int(DOC_ANNO);
numpart = doc.get(DOC_NDOC);
break;
}
}
reffetto.put(REFF_ANNO, anno);
reffetto.put(REFF_NUMPART, numpart);
importo = pag.importo_rata(i,FALSE);
effetto.put(EFF_IMPORTO,importo);
reffetto.put(REFF_IMPFATT,totale_fatt.get_num());