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

Merge branch 'R_10_00' of http://10.65.20.17:7990/scm/campo/campo into R_10_00

Browse Source
This commit is contained in:
AlexBonazzi 2019-01-21 23:26:15 +01:00
commit 5d1736efe8
23 changed files with 587 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build/fp.sln
View File

@ -8,10 +8,13 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fp0", "fp0.vcxproj", "{9C91BACF-9A70-4973-B8CC-FA3D2AF9867C}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fp0", "fp0.vcxproj", "{9C91BACF-9A70-4973-B8CC-FA3D2AF9867C}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{C575788B-0BE4-4F68-B9C9-3C204EC04E07} = {C575788B-0BE4-4F68-B9C9-3C204EC04E07} {C575788B-0BE4-4F68-B9C9-3C204EC04E07} = {C575788B-0BE4-4F68-B9C9-3C204EC04E07}
{7BF6939E-DFCD-49ED-B0A8-EDB68DDCE6D5} = {7BF6939E-DFCD-49ED-B0A8-EDB68DDCE6D5}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", "{2D38A763-3D74-4338-9362-B891784EC90E}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", "{2D38A763-3D74-4338-9362-B891784EC90E}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tflib", "tflib.vcxproj", "{7BF6939E-DFCD-49ED-B0A8-EDB68DDCE6D5}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32 Debug|Win32 = Debug|Win32
@ -30,6 +33,10 @@ Global
{2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.Build.0 = Debug|Win32 {2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.Build.0 = Debug|Win32
{2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.ActiveCfg = Release|Win32 {2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.ActiveCfg = Release|Win32
{2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.Build.0 = Release|Win32 {2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.Build.0 = Release|Win32
{7BF6939E-DFCD-49ED-B0A8-EDB68DDCE6D5}.Debug|Win32.ActiveCfg = Debug|Win32
{7BF6939E-DFCD-49ED-B0A8-EDB68DDCE6D5}.Debug|Win32.Build.0 = Debug|Win32
{7BF6939E-DFCD-49ED-B0A8-EDB68DDCE6D5}.Release|Win32.ActiveCfg = Release|Win32
{7BF6939E-DFCD-49ED-B0A8-EDB68DDCE6D5}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

2
build/fp0.vcxproj
View File

@ -193,14 +193,12 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\src\fp\fp0300.cpp" /> <ClCompile Include="..\src\fp\fp0300.cpp" />
<ClCompile Include="..\src\tf\tfutility.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\src\fp\fp0.h" /> <ClInclude Include="..\src\fp\fp0.h" />
<ClInclude Include="..\src\fp\fp0100a.h" /> <ClInclude Include="..\src\fp\fp0100a.h" />
<ClInclude Include="..\src\fp\fp0200a.h" /> <ClInclude Include="..\src\fp\fp0200a.h" />
<ClInclude Include="..\src\fp\fp0300a.h" /> <ClInclude Include="..\src\fp\fp0300a.h" />
<ClInclude Include="..\src\tf\tfutility.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<MskCompiler Include="..\src\fp\fp0200a.uml"> <MskCompiler Include="..\src\fp\fp0200a.uml">

6
build/fp0.vcxproj.filters
View File

@ -27,9 +27,6 @@
<ClCompile Include="..\src\fp\fp0.cpp"> <ClCompile Include="..\src\fp\fp0.cpp">
<Filter>Sources</Filter> <Filter>Sources</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\src\tf\tfutility.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\fp\fp0100.cpp"> <ClCompile Include="..\src\fp\fp0100.cpp">
<Filter>Sources</Filter> <Filter>Sources</Filter>
</ClCompile> </ClCompile>
@ -53,9 +50,6 @@
<ClInclude Include="..\src\fp\fp0.h"> <ClInclude Include="..\src\fp\fp0.h">
<Filter>Headers</Filter> <Filter>Headers</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\src\tf\tfutility.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\src\fp\fp0200a.h"> <ClInclude Include="..\src\fp\fp0200a.h">
<Filter>Headers</Filter> <Filter>Headers</Filter>
</ClInclude> </ClInclude>

27
build/tf.sln
View File

@ -1,7 +1,12 @@
 
Microsoft Visual Studio Solution File, Format Version 11.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2010 # Visual Studio 15
VisualStudioVersion = 15.0.28307.106
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tf0", "tf0.vcxproj", "{9C91BACF-9A70-4973-B8CC-FA3D2AF9867C}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tf0", "tf0.vcxproj", "{9C91BACF-9A70-4973-B8CC-FA3D2AF9867C}"
ProjectSection(ProjectDependencies) = postProject
{7BF6939E-DFCD-49ED-B0A8-EDB68DDCE6D5} = {7BF6939E-DFCD-49ED-B0A8-EDB68DDCE6D5}
EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", "{2D38A763-3D74-4338-9362-B891784EC90E}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", "{2D38A763-3D74-4338-9362-B891784EC90E}"
EndProject EndProject
@ -9,6 +14,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc", "vedoc.vcxproj", "{
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedocext", "vedocext.vcxproj", "{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedocext", "vedocext.vcxproj", "{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fplib", "fplib.vcxproj", "{C575788B-0BE4-4F68-B9C9-3C204EC04E07}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tflib", "tflib.vcxproj", "{7BF6939E-DFCD-49ED-B0A8-EDB68DDCE6D5}"
ProjectSection(ProjectDependencies) = postProject
{C575788B-0BE4-4F68-B9C9-3C204EC04E07} = {C575788B-0BE4-4F68-B9C9-3C204EC04E07}
EndProjectSection
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32 Debug|Win32 = Debug|Win32
@ -31,8 +43,19 @@ Global
{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Debug|Win32.Build.0 = Debug|Win32 {0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Debug|Win32.Build.0 = Debug|Win32
{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.ActiveCfg = Release|Win32 {0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.ActiveCfg = Release|Win32
{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.Build.0 = Release|Win32 {0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.Build.0 = Release|Win32
{C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Debug|Win32.ActiveCfg = Debug|Win32
{C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Debug|Win32.Build.0 = Debug|Win32
{C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Release|Win32.ActiveCfg = Release|Win32
{C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Release|Win32.Build.0 = Release|Win32
{7BF6939E-DFCD-49ED-B0A8-EDB68DDCE6D5}.Debug|Win32.ActiveCfg = Debug|Win32
{7BF6939E-DFCD-49ED-B0A8-EDB68DDCE6D5}.Debug|Win32.Build.0 = Debug|Win32
{7BF6939E-DFCD-49ED-B0A8-EDB68DDCE6D5}.Release|Win32.ActiveCfg = Release|Win32
{7BF6939E-DFCD-49ED-B0A8-EDB68DDCE6D5}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {864F23A5-CCF4-4E1F-9D38-1416F09EEE8D}
EndGlobalSection
EndGlobal EndGlobal

6
build/tf0.vcxproj
View File

@ -64,7 +64,7 @@
</Midl> </Midl>
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\src\xvtext\;..\src\cg;..\src\include;..\src\xvaga;..\src\fe;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\src\xvtdb\;..\src\xvtext\;..\src\cg;..\src\include;..\src\xvaga;..\src\fe;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@ -111,7 +111,7 @@
<ClCompile> <ClCompile>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>Default</InlineFunctionExpansion> <InlineFunctionExpansion>Default</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\src\cg;..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\src\xvtdb\;..\src\xvtext\;..\src\cg;..\src\include;..\src\xvaga;..\src\fe;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@ -188,7 +188,6 @@
<ClInclude Include="..\src\tf\tf0400a.h" /> <ClInclude Include="..\src\tf\tf0400a.h" />
<ClInclude Include="..\src\tf\tf0500a.h" /> <ClInclude Include="..\src\tf\tf0500a.h" />
<ClInclude Include="..\src\tf\tftbcon.h" /> <ClInclude Include="..\src\tf\tftbcon.h" />
<ClInclude Include="..\src\tf\tfutility.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\src\cg\cglib01.cpp" /> <ClCompile Include="..\src\cg\cglib01.cpp" />
@ -202,7 +201,6 @@
<ClCompile Include="..\src\tf\tf0300.cpp" /> <ClCompile Include="..\src\tf\tf0300.cpp" />
<ClCompile Include="..\src\tf\tf0400.cpp" /> <ClCompile Include="..\src\tf\tf0400.cpp" />
<ClCompile Include="..\src\tf\tf0500.cpp" /> <ClCompile Include="..\src\tf\tf0500.cpp" />
<ClCompile Include="..\src\tf\tfutility.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<MskCompiler Include="..\src\tf\tf0100a.uml"> <MskCompiler Include="..\src\tf\tf0100a.uml">

26
build/tf0.vcxproj.filters
View File

@ -16,7 +16,7 @@
<Filter Include="Ini"> <Filter Include="Ini">
<UniqueIdentifier>{681a7df4-f2b5-4870-8949-6d7adba5aa29}</UniqueIdentifier> <UniqueIdentifier>{681a7df4-f2b5-4870-8949-6d7adba5aa29}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Ini\Masks"> <Filter Include="Masks">
<UniqueIdentifier>{a3067f4a-a21c-4966-b31b-d0536b8df95f}</UniqueIdentifier> <UniqueIdentifier>{a3067f4a-a21c-4966-b31b-d0536b8df95f}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
@ -39,9 +39,6 @@
<ClInclude Include="..\src\tf\tf0400a.h"> <ClInclude Include="..\src\tf\tf0400a.h">
<Filter>Headers</Filter> <Filter>Headers</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\src\tf\tfutility.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\src\tf\tf0100b.h"> <ClInclude Include="..\src\tf\tf0100b.h">
<Filter>Headers</Filter> <Filter>Headers</Filter>
</ClInclude> </ClInclude>
@ -56,9 +53,6 @@
<ClCompile Include="..\src\tf\tf0.cpp"> <ClCompile Include="..\src\tf\tf0.cpp">
<Filter>Sources</Filter> <Filter>Sources</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\src\fe\felib.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\tf\tf0200.cpp"> <ClCompile Include="..\src\tf\tf0200.cpp">
<Filter>Sources</Filter> <Filter>Sources</Filter>
</ClCompile> </ClCompile>
@ -68,9 +62,6 @@
<ClCompile Include="..\src\tf\tf0400.cpp"> <ClCompile Include="..\src\tf\tf0400.cpp">
<Filter>Sources</Filter> <Filter>Sources</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\src\tf\tfutility.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\tf\tf0102.cpp"> <ClCompile Include="..\src\tf\tf0102.cpp">
<Filter>Sources</Filter> <Filter>Sources</Filter>
</ClCompile> </ClCompile>
@ -86,25 +77,28 @@
<ClCompile Include="..\src\cg\cglib03.cpp"> <ClCompile Include="..\src\cg\cglib03.cpp">
<Filter>Sources</Filter> <Filter>Sources</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\src\fe\felib.cpp">
<Filter>Sources</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<MskCompiler Include="..\src\tf\tftbcon.uml"> <MskCompiler Include="..\src\tf\tftbcon.uml">
<Filter>Ini\Masks</Filter> <Filter>Masks</Filter>
</MskCompiler> </MskCompiler>
<MskCompiler Include="..\src\tf\tf0100a.uml"> <MskCompiler Include="..\src\tf\tf0100a.uml">
<Filter>Ini\Masks</Filter> <Filter>Masks</Filter>
</MskCompiler> </MskCompiler>
<MskCompiler Include="..\src\tf\tf0200a.uml"> <MskCompiler Include="..\src\tf\tf0200a.uml">
<Filter>Ini\Masks</Filter> <Filter>Masks</Filter>
</MskCompiler> </MskCompiler>
<MskCompiler Include="..\src\tf\tf0500a.uml"> <MskCompiler Include="..\src\tf\tf0500a.uml">
<Filter>Ini\Masks</Filter> <Filter>Masks</Filter>
</MskCompiler> </MskCompiler>
<MskCompiler Include="..\src\tf\tf0400a.uml"> <MskCompiler Include="..\src\tf\tf0400a.uml">
<Filter>Ini\Masks</Filter> <Filter>Masks</Filter>
</MskCompiler> </MskCompiler>
<MskCompiler Include="..\src\tf\tf0300a.uml"> <MskCompiler Include="..\src\tf\tf0300a.uml">
<Filter>Ini\Masks</Filter> <Filter>Masks</Filter>
</MskCompiler> </MskCompiler>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

21
build/tflib.filters Normal file
View File

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Headers">
<UniqueIdentifier>{72a9ea2f-8fbe-4546-96f3-21a4de35bf0e}</UniqueIdentifier>
</Filter>
<Filter Include="Sources">
<UniqueIdentifier>{afa0f493-bfe6-4bd2-add2-3256306ed9c5}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\tf\tfutility.cpp">
<Filter>Sources</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\tf\tfutility.h">
<Filter>Headers</Filter>
</ClInclude>
</ItemGroup>
</Project>

181
build/tflib.vcxproj Normal file
View File

@ -0,0 +1,181 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{7BF6939E-DFCD-49ED-B0A8-EDB68DDCE6D5}</ProjectGuid>
<RootNamespace>fp</RootNamespace>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
<Import Project="CampoRules.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\obj\$(SolutionName)\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\obj\$(SolutionName)\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
<EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</EmbedManifest>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\..\debug/li0.tlb</TypeLibraryName>
<HeaderFileName>
</HeaderFileName>
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\src\xvtdb\;..\src\cg;..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;__LONGDOUBLE__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
<BrowseInformation>true</BrowseInformation>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<StringPooling>true</StringPooling>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ShowProgress>NotSet</ShowProgress>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>.\..\debug/li0.bsc</OutputFile>
</Bscmake>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\..\release/li0.tlb</TypeLibraryName>
<HeaderFileName>
</HeaderFileName>
</Midl>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>..\src\xvtdb\;..\src\cg;..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<BrowseInformation>false</BrowseInformation>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<SubSystem>Windows</SubSystem>
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<Version>12.0</Version>
<GenerateDebugInformation>false</GenerateDebugInformation>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>.\..\release/li0.bsc</OutputFile>
</Bscmake>
</ItemDefinitionGroup>
<ItemGroup>
<CustomBuildStep Include="..\lib\AgaLib.lib">
<FileType>Document</FileType>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</CustomBuildStep>
<CustomBuildStep Include="..\lib\AgaLibD.lib">
<FileType>Document</FileType>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</CustomBuildStep>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="AgaLib.vcxproj">
<Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
</ProjectReference>
<ProjectReference Include="vedoc.vcxproj">
<Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
</ProjectReference>
<ProjectReference Include="vedocext.vcxproj">
<Project>{0042619a-6b7c-4d3d-9cd9-9bdd8d200c15}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\tf\tfutility.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\fe\felib.cpp" />
<ClCompile Include="..\src\tf\tfutility.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="CampoRules.targets" />
</ImportGroup>
</Project>

2
cd/test/ca0676.txt
View File

@ -1,4 +1,4 @@
ca3800a.rep ca3800a.rep
ca3900.msk ca3800c.rep
Sistemato il formato dei report di bilancio per commessa Sistemato il formato dei report di bilancio per commessa

4
cd/test/ca0676a.ini
View File

@ -9,12 +9,12 @@ Edit_147 = ca0 -5
Edit_148 = ca0 -6 Edit_148 = ca0 -6
Edit_149 = ca0 -7 Edit_149 = ca0 -7
File(44) = ca3800a.rep|X File(44) = ca3800a.rep|X
File(47) = ca3900.msk|X File(46) = ca3800c.rep|X
Patch = 676 Patch = 676
Versione = 21511200 Versione = 21511200
[ca] [ca]
Data = 18-10-2018 Data = 20-01-2019
Descrizione = Contabilita' Analitica Descrizione = Contabilita' Analitica
Dischi = 1 Dischi = 1
Moduli = ba,cg Moduli = ba,cg

BIN
cd/test/ca0676a1.zip
View File

Binary file not shown.

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

@ -0,0 +1,4 @@
cg0.exe
cg0200a.msk
Aggiunto il tipo cliente Gruppo IVA (G) che premette l&#39;inserimento di una partita IVa già inserita

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

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

BIN
cd/test/cg0676a1.zip Normal file
View File

Binary file not shown.

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

@ -0,0 +1,3 @@
fp0.exe
Sistemata numerazione documenti con prefisso e postfisso, viene utilizzato il numero zerofilled

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

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

BIN
cd/test/fp0678a1.zip Normal file
View File

Binary file not shown.

21
cd/test/ve0676.txt Normal file
View File

@ -0,0 +1,21 @@
ve5.exe
ve1.exe
ve6.exe
vemenu.men
ve0.exe
ve0200d.msk
vetbprs.msk
vetbspp.msk
cg0.exe
cg0200a.msk
pr0.exe
Se in una riga di sconto metto l' aliquota viene usata questa invece di suddividere l&#39;imponibile tra le aliquote della fqttura
La stampa tabelle vendite chiamava un programma sbagliato
Aggiunto un parametro di configurazione nascosto (UpdateProtocol=[ |X]) che forza la rilettura del protocollo IVA a ogni documento contabilizzato
Aggiunto codice quadro alle tabelle spese e prestazioni
Aggiunto codice tributo e causale 770 alla tabella prestazioni

162
cd/test/ve0676a.ini Normal file
View File

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

BIN
cd/test/ve0676a1.zip Normal file
View File

Binary file not shown.

3
src/tf/tf0100a.h
View File

@ -19,9 +19,10 @@
#define B_TIPO_BOLLADOG 413 #define B_TIPO_BOLLADOG 413
#define B_TIPO_STORDOC 414 #define B_TIPO_STORDOC 414
#define END_BOOLEAN 415 #define END_BOOLEAN 415
#define F_ESTEROMETRO 416
#define END_MASK 421 #define END_MASK 421
#define F_RIGHE 301 // Sheet righe tf #define F_RIGHE 301 // Sheet righe tf

6
src/tf/tf0100a.uml
View File

@ -165,6 +165,12 @@ BEGIN
FLAGS "" FLAGS ""
END END
BOOLEAN B_ESTEROMETRO
BEGIN
PROMPT 1 10 "Esporta solo fatture attive non inviate con FP"
FLAGS ""
END
ENDPAGE ENDPAGE
PAGE "Trasferimento Fatture" 0 2 0 0 PAGE "Trasferimento Fatture" 0 2 0 0

23
src/tf/tfutility.cpp
View File

@ -4,6 +4,8 @@
#include "../cg/cglib03.h" #include "../cg/cglib03.h"
#include "../fe/felib.h" #include "../fe/felib.h"
#include "tfutility.h" #include "tfutility.h"
#include "../fp/fplib.h"
#include "tf0100b.h"
// Ritorna il record da trasfatt // Ritorna il record da trasfatt
@ -102,6 +104,27 @@ bool checkRecord(TISAM_recordset* rec)
TCausale caus(rec->get("23.CODCAUS").as_string(), rec->get("23.DATAREG").as_date().year()); TCausale caus(rec->get("23.CODCAUS").as_string(), rec->get("23.DATAREG").as_date().year());
if(caus.soloiva() && (caus.reverse_charge() || caus.regime_speciale() == 3)) if(caus.soloiva() && (caus.reverse_charge() || caus.regime_speciale() == 3))
return false; return false;
// controllo se la fattura non è già stata spedita con la fatt. elettronica
static TPaf_record paf0100f("PAF0100F");
// controllo se il movimento è agganciato a un documento
if(!rec->get("23.DPROVV").is_empty() && !rec->get("23.DANNO").is_empty() && !rec->get("23.DCODNUM").is_empty() && !rec->get("23.DNDOC").is_empty())
{
TString hfatt, bfatt;
TRectype rdoc(LF_DOC);
rdoc.put(DOC_PROVV, rec->get("23.DPROVV").as_string());
rdoc.put(DOC_PROVV, rec->get("23.DANNO").as_string());
rdoc.put(DOC_PROVV, rec->get("23.DCODNUM").as_string());
rdoc.put(DOC_PROVV, rec->get("23.DNDOC").as_string());
// se riesco a generare la chiave, trovo il record e ha il flag di gestione in errore o un errore esterno, salto la fattura (solo se attivo flag in maschera)
if (msk().get_bool(F_ESTEROMETRO) && chiave_paf(rdoc, hfatt, bfatt) && paf0100f.search(nullptr, hfatt, bfatt) && (paf0100f.sq_get("P1_GESTIONE") == "E" || paf0100f.sq_get("P1_ERREST") == "*"))
{
return false;
}
}
} else if(anaCli.italiano() && anaCli.partita_IVA()[0] != '0' && anaCli.partita_IVA()[0] != '1' && anaCli.codice_fiscale()[0] > '8') } else if(anaCli.italiano() && anaCli.partita_IVA()[0] != '0' && anaCli.partita_IVA()[0] != '1' && anaCli.codice_fiscale()[0] > '8')
// Salto tutti i fornitori con cod cf che inizia per 8 o 9 e con p.iva non valida // Salto tutti i fornitori con cod cf che inizia per 8 o 9 e con p.iva non valida
{ {