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:
Mattia Tollari 2018-07-06 16:40:28 +02:00
commit 978a4bb1bf
110 changed files with 7554 additions and 5698 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/Cg0.vcxproj
View File

@ -143,6 +143,9 @@
<Xdcmake>
<OutputFile>$(IntDir)$(TargetName).xml</OutputFile>
</Xdcmake>
<PostBuildEvent>
<Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /fd sha256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /v "$(TargetPath)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\cg\cg0.cpp">

3
build/Cg1.vcxproj
View File

@ -147,6 +147,9 @@
<Xdcmake>
<OutputFile>$(IntDir)$(TargetName).xml</OutputFile>
</Xdcmake>
<PostBuildEvent>
<Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /fd sha256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /v "$(TargetPath)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\cg\cg1.cpp">

3
build/Cg2.vcxproj
View File

@ -98,6 +98,9 @@
<Xdcmake>
<OutputFile>$(IntDir)$(TargetName).xml</OutputFile>
</Xdcmake>
<PostBuildEvent>
<Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /fd sha256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /v "$(TargetPath)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>

3
build/Cg3.vcxproj
View File

@ -149,6 +149,9 @@
<Xdcmake>
<OutputFile>$(IntDir)$(TargetName).xml</OutputFile>
</Xdcmake>
<PostBuildEvent>
<Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /fd sha256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /v "$(TargetPath)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\cg\cg2103.cpp" />

3
build/Cg4.vcxproj
View File

@ -98,6 +98,9 @@
<Xdcmake>
<OutputFile>$(IntDir)$(TargetName).xml</OutputFile>
</Xdcmake>
<PostBuildEvent>
<Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /fd sha256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /v "$(TargetPath)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>

3
build/Cg5.vcxproj
View File

@ -154,6 +154,9 @@
<Xdcmake>
<OutputFile>$(IntDir)$(TargetName).xml</OutputFile>
</Xdcmake>
<PostBuildEvent>
<Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /fd sha256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /v "$(TargetPath)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\cg\cg2103.cpp" />

3
build/Cg6.vcxproj
View File

@ -153,6 +153,9 @@
<Xdcmake>
<OutputFile>$(IntDir)$(TargetName).xml</OutputFile>
</Xdcmake>
<PostBuildEvent>
<Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /fd sha256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /v "$(TargetPath)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\cg\cg2103.cpp" />

3
build/Cg7.vcxproj
View File

@ -153,6 +153,9 @@
<Xdcmake>
<OutputFile>$(IntDir)$(TargetName).xml</OutputFile>
</Xdcmake>
<PostBuildEvent>
<Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /fd sha256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /v "$(TargetPath)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\ba\ba8500.cpp" />

11
build/Sc0.vcxproj
View File

@ -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>
@ -13,15 +13,18 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{2B00E997-EA43-4988-8CAB-BC145C3E7D6D}</ProjectGuid>
<RootNamespace>sc0</RootNamespace>
<WindowsTargetPlatformVersion>10.0.16299.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">
@ -78,7 +81,7 @@
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -101,6 +104,9 @@
<ManifestResourceCompile>
<ResourceOutputFileName>$(IntDir)</ResourceOutputFileName>
</ManifestResourceCompile>
<PostBuildEvent>
<Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /fd sha256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /v "$(TargetPath)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
@ -154,6 +160,7 @@
</ManifestResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\cg\cg2103.cpp" />
<ClCompile Include="..\src\cg\cglib01.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

3
build/Sc0.vcxproj.filters
View File

@ -46,6 +46,9 @@
<ClCompile Include="..\src\sc\sc0300.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cg2103.cpp">
<Filter>Sources</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<MskCompiler Include="..\src\sc\sc0100a.uml">

10
build/Sc1.vcxproj
View File

@ -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>
@ -13,15 +13,18 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{AB0F060F-17E4-4F74-9463-4282AE804CA6}</ProjectGuid>
<RootNamespace>sc1</RootNamespace>
<WindowsTargetPlatformVersion>10.0.16299.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">
@ -125,7 +128,7 @@
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -144,6 +147,9 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>.\..\release/Sc1.bsc</OutputFile>
</Bscmake>
<PostBuildEvent>
<Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /fd sha256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /v "$(TargetPath)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\cg\cg2101.cpp" />

10
build/Sc2.vcxproj
View File

@ -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>
@ -13,15 +13,18 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{F0C79702-F13D-49F6-8EBC-22AF635B507D}</ProjectGuid>
<RootNamespace>sc2</RootNamespace>
<WindowsTargetPlatformVersion>10.0.16299.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">
@ -120,7 +123,7 @@
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -139,6 +142,9 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>.\..\release/Sc2.bsc</OutputFile>
</Bscmake>
<PostBuildEvent>
<Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /fd sha256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /v "$(TargetPath)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\ca\calib01.cpp" />

10
build/Sc3.vcxproj
View File

@ -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>
@ -13,15 +13,18 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{F243C7AE-7BD6-4777-8256-267E647796FE}</ProjectGuid>
<RootNamespace>sc3</RootNamespace>
<WindowsTargetPlatformVersion>10.0.16299.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">
@ -117,7 +120,7 @@
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -134,6 +137,9 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>.\..\release/Sc3.bsc</OutputFile>
</Bscmake>
<PostBuildEvent>
<Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /fd sha256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /v "$(TargetPath)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\ba\baformed.cpp" />

9
build/ab0.vcxproj
View File

@ -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>
@ -13,15 +13,18 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{8A5E2448-8A61-425A-9F20-6355245D3D6A}</ProjectGuid>
<RootNamespace>ab0</RootNamespace>
<WindowsTargetPlatformVersion>10.0.16299.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">
@ -238,7 +241,9 @@
<ClInclude Include="..\src\cg\cglib02.h" />
</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">

5
build/ab1.vcxproj
View File

@ -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>{4AFC73D7-C6FC-4854-B6E4-313890419DCB}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.16299.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/ab2.vcxproj
View File

@ -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>{FAD94034-5DE7-4BDB-B835-D46A4531D507}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.16299.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/ab3.vcxproj
View File

@ -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>{4F2E1582-F3F1-43BF-897B-5CD14C0C1F14}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.16299.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">

10
build/np0.vcxproj
View File

@ -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>{3D726EFE-764B-4B24-A4ED-DCD41B9BB386}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.16299.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">
@ -72,7 +75,7 @@
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -95,6 +98,9 @@
<Xdcmake>
<OutputFile>$(IntDir)</OutputFile>
</Xdcmake>
<PostBuildEvent>
<Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /fd sha256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /v "$(TargetPath)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>

18
build/tp0.vcxproj
View File

@ -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>
@ -13,15 +13,18 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{7F47BB01-1600-4ED1-852A-6111116DB1F6}</ProjectGuid>
<RootNamespace>tp0</RootNamespace>
<WindowsTargetPlatformVersion>10.0.16299.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">
@ -120,7 +123,7 @@
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -138,6 +141,9 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>.\..\release/tp0.bsc</OutputFile>
</Bscmake>
<PostBuildEvent>
<Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /fd sha256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /v "$(TargetPath)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\cg\cglib02.cpp" />
@ -250,11 +256,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</CustomBuildStep>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="campo.rc">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="AgaLib.vcxproj">
<Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
@ -263,6 +264,9 @@
<Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="campo.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="CampoRules.targets" />

6
build/tp0.vcxproj.filters
View File

@ -182,12 +182,12 @@
<Filter>Png</Filter>
</PngCompiler>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="campo.rc" />
</ItemGroup>
<ItemGroup>
<MenCompiler Include="..\src\tp\tpmenu.men">
<Filter>Menu</Filter>
</MenCompiler>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="campo.rc" />
</ItemGroup>
</Project>

3
build/ve0.vcxproj
View File

@ -145,6 +145,9 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)$(TargetName).bsc</OutputFile>
</Bscmake>
<PostBuildEvent>
<Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /fd sha256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /v "$(TargetPath)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\ve\ve0.cpp">

5
build/ve1.vcxproj
View File

@ -77,7 +77,7 @@
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -95,6 +95,9 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)$(TargetName).bsc</OutputFile>
</Bscmake>
<PostBuildEvent>
<Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /fd sha256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /v "$(TargetPath)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>

5
build/ve2.vcxproj
View File

@ -123,7 +123,7 @@
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -142,6 +142,9 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)$(TargetName).bsc</OutputFile>
</Bscmake>
<PostBuildEvent>
<Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /fd sha256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /v "$(TargetPath)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\ca\calib01.cpp">

5
build/ve3.vcxproj
View File

@ -124,7 +124,7 @@
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -144,6 +144,9 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)$(TargetName).bsc</OutputFile>
</Bscmake>
<PostBuildEvent>
<Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /fd sha256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /v "$(TargetPath)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\ba\ba8500.cpp" />

5
build/ve4.vcxproj
View File

@ -126,7 +126,7 @@
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -145,6 +145,9 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)$(TargetName).bsc</OutputFile>
</Bscmake>
<PostBuildEvent>
<Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /fd sha256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /v "$(TargetPath)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\ve\ve4.cpp">

5
build/ve5.vcxproj
View File

@ -77,7 +77,7 @@
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -96,6 +96,9 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)$(TargetName).bsc</OutputFile>
</Bscmake>
<PostBuildEvent>
<Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /fd sha256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /v "$(TargetPath)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>

5
build/ve6.vcxproj
View File

@ -123,7 +123,7 @@
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -142,6 +142,9 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)$(TargetName).bsc</OutputFile>
</Bscmake>
<PostBuildEvent>
<Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /fd sha256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /v "$(TargetPath)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\ve\ve6.cpp">

5
build/ve8.vcxproj
View File

@ -124,7 +124,7 @@
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -144,6 +144,9 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)$(TargetName).bsc</OutputFile>
</Bscmake>
<PostBuildEvent>
<Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /fd sha256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /v "$(TargetPath)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\ab\ablib09.cpp">

8
cd/test/cg0596.txt Normal file
View File

@ -0,0 +1,8 @@
cg2.exe
cg3.exe
cg2100p.msk
Riattivata la possibiltà di cancellare il numero di movimento nella maschera partite per poter eliminare scadenze errate.
Per attivarla bisonga mettere una variabile HatTrick =X nel paramatro cg del file studio.ini
Ricompilato cg3 e le maschere della lista movimenti per il problema Sicart.

96
cd/test/cg0596a.ini Normal file
View File

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

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

Binary file not shown.

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

@ -0,0 +1,4 @@
ci0300a.msk
ci2.exe
Duplicati in industriale i flag di obblicatorietà delle commesse e dei centri di costo

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

@ -0,0 +1,26 @@
[Main]
Demo=0
[ci1]
File(2) = ci0300a.msk|X
Patch = 596
Versione = 21511200
[ci2]
File(26) = ci2.exe|X
Patch = 596
Versione = 21511200
[ci]
Data = 06-06-2016
Descrizione = Contabilita' Industriale
Dischi = 1
Moduli = ve
OEM =
Patch = 596
PostProcess =
PreProcess =
Prezzo(1) =
Prezzo(2) =
Versione = 21511200

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

Binary file not shown.

10
cd/test/np0596.txt Normal file
View File

@ -0,0 +1,10 @@
np0.exe
np0200a.msk
np0500a.msk
np0500b.msk
np0300a.msk
np0400a.msk
npmenu.men
nptbent.msk
Aggiuta scelta contabilità separata nei mastini della contabilità separata. Riferimento CRPA.

27
cd/test/np0596a.ini Normal file
View File

@ -0,0 +1,27 @@
[Main]
Demo=0
[np0]
Edit_163 = np0 -0
File(0) = np0.exe|X
File(1) = np0200a.msk|X
File(2) = np0300a.msk|X
File(3) = np0400a.msk|X
File(4) = np0500a.msk|X
File(5) = np0500b.msk|X
File(6) = npmenu.men|X
File(7) = nptbent.msk|X
Patch = 596
Versione = 21511200
[np]
Data = 10-01-2017
Descrizione = Contabilità separata
Dischi = 1
Moduli = cg
OEM =
Patch = 596
PostProcess =
PreProcess =
Versione = 21511200

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

Binary file not shown.

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

@ -0,0 +1,4 @@
sc0.exe
Riattivata la possibiltà di canrellare il numero di movimento nella maschera partite per poter eliminare scadenze errate.
Per attivarla bisonga mettere una variabile HatTrick =X nel paramatro cg del file studio.ini

21
cd/test/sc0596a.ini Normal file
View File

@ -0,0 +1,21 @@
[Main]
Demo=0
[sc1]
File(2) = sc0.exe|X
Patch = 596
Versione = 21511200
[sc]
Data = 28-06-2018
Descrizione = Saldaconto
Dischi = 1
Moduli = ba,cg
OEM =
Patch = 596
PostProcess =
PreProcess =
Prezzo(1) =
Prezzo(2) =
Versione = 21511200

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

Binary file not shown.

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

@ -0,0 +1,4 @@
ba1.exe
Eliminata attesa nel compattamento

21
cd/test/sy0596a.ini Normal file
View File

@ -0,0 +1,21 @@
[Main]
Demo=0
[sy1]
File(11) = ba1.exe|X
Patch = 596
Versione = 21511200
[sy]
Data = 26-06-2018
Descrizione = Sistema
Dischi = 1
Moduli =
OEM =
Patch = 596
PostProcess =
PreProcess =
Prezzo(1) =
Prezzo(2) =
Versione = 21511200

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

Binary file not shown.

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

@ -0,0 +1,3 @@
tp0.exe
Importata sottocategoria per tutte le categorie CONAI

21
cd/test/tp0596a.ini Normal file
View File

@ -0,0 +1,21 @@
[Main]
Demo=0
[tp1]
File(1) = tp0.exe|X
Patch = 596
Versione = 21511200
[tp]
Data = 06-06-2016
Descrizione = Trasferimento PACK
Dischi = 1
Moduli = ve
OEM =
Patch = 596
PostProcess =
PreProcess =
Prezzo(1) =
Prezzo(2) =
Versione = 21511200

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

Binary file not shown.

7
cd/test/ve0596.txt Normal file
View File

@ -0,0 +1,7 @@
ve5.exe
ve6.exe
ve1.exe
ve0.exe
Corretta generazione dei movimenti di differenza inventariale dai documenti. Riferimento stampa inventari Diana 2000
inserimento di codici IVA sospesi. Riferimento CRPA.

141
cd/test/ve0596a.ini Normal file
View File

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

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

Binary file not shown.

BIN
exe/Ba1.exe
View File

Binary file not shown.

BIN
exe/Cb6.dll
View File

Binary file not shown.

BIN
exe/ba0.exe
View File

Binary file not shown.

15
exe/ba0100m.msk
View File

@ -17,23 +17,28 @@ TE -1
BE
PR 25 2 "GMail: 465 -ssl -auth-plain"
EN
ST 103 50
BO 103
BE
PR 1 3 "Abilita invio con PowerShell (solo per Windows 8 o superiore)"
FI Powershell
EN
ST 104 50
BE
PR 1 4 "Utente "
FI User
EN
ST 104 50
ST 105 50
BE
PR 1 5 "Password "
FI Password
FL "*"
EN
ST 105 260 50
ST 106 260 50
BE
PR 1 6 "Da "
FI From
EN
LI 106 1
LI 107 1
BE
PR 21 7 "Tentativi di trasmissione "
IT "1|1"
@ -43,7 +48,7 @@ IT "4|4"
IT "5|5"
FI Retry
EN
ME 107 60 4
ME 108 60 4
BE
PR 1 7 "Saluti / Firma"
FI Signature

2
exe/ba0200a.msk
View File

@ -71,7 +71,7 @@ TE -1
BE
PR -11 11 "Dimensione barra degli strumenti"
EN
SLIDER 218 -1 1
SL 218 -1 1
BE
PR 1 12 "Dimensione icone"
RANGE 0 14

6
exe/ba1100a.msk
View File

@ -34,6 +34,12 @@ VA 0 2 0 (#0>=0)&&(#0<=#112)
FL "DR"
GR 1
EN
NU 116 1
BE
PR 30 5 "Chiave "
FL "DR"
GR 1
EN
BO 111
BE
PR 2 6 "Cambia dimensione"

14
exe/bagn009.msk
View File

@ -1,16 +1,20 @@
PA "Esportazione" -1 -1 76 5
GR -1 74 4
GR -1 74 5
BE
PR 1 1 "@bFile di Output"
EN
ST 101 80 58
ST 101 80 48
BE
PR 2 2 "Cartella "
PR 2 2 "Cartella "
DSELECT
EN
ST 108 128 60
ST 108 128 50
BE
PR 2 3 "File "
PR 2 3 "File "
EN
ST 103 128 3
BE
PR 2 4 "Lunghezza riga (txt) "
EN
EN
TOOLBAR "topbar" 0 0 0 2

16
exe/bagn010a.rep
View File

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8" ?>
<report name="bagn010a" lpi="6">
<description>Log di elaborazione</description>
<font face="Arial" size="10" />
<section type="Head" />
<section type="Head" level="1">
<font face="Courier New" size="10" />
<section type="Head" pattern="1" />
<section type="Head" level="1" pattern="1">
<field type="Stringa" valign="center" align="center" width="80" height="3" pattern="1">
<font face="Arial" bold="1" size="24" />
<source>#TITLE</source>
</field>
</section>
<section type="Body" />
<section type="Body" level="1">
<section type="Body" pattern="1" />
<section type="Body" level="1" pattern="1">
<field type="Array" width="10" pattern="1">
<source>A</source>
<list>
@ -23,6 +23,6 @@
<source>B</source>
</field>
</section>
<section type="Foot" />
<section type="Foot" level="1" />
<section type="Foot" pattern="1" />
<section type="Foot" level="1" pattern="1" />
</report>

5
exe/campo.ini
View File

@ -1,8 +1,9 @@
[Main]
Donglehw =4
Firm =00010a
Firm =com
MaxHandles = 32
Study =E:\dati\Pragma\
Study =C:\Users\sirio\Documents\SoftwareSirio\Campo\datidemo\
Type = 1
User = ADMIN
Temp=c:\temp

BIN
exe/gfm.dll
View File

Binary file not shown.

1974
exe/install.ini
View File

File diff suppressed because it is too large Load Diff

BIN
exe/pdflib.dll
View File

Binary file not shown.

2
exe/recdesc/f115.dir
View File

@ -1,3 +1,3 @@
115
0
$convoc|1178|1178|151|17|Convocazioni AVIS|||
$pacchi|0|0|188|0|Gestione Pacchi|||

39
exe/recdesc/f115.trr
View File

@ -1,21 +1,22 @@
115
15
NUMERO|3|5|0|Numero convocazione
DATA|5|8|0|Data convocazione
PUNTO|1|4|0|Punto di raccolta
TIPO|1|2|0|Tipo donazione
CODSEZ|1|2|0|Codice sezione convocata
CODSOT|1|2|0|Codice sottogruppo convocato
DATAINI|5|8|0|Data inizio convocazione
RITARDA|8|1|0|Ritardatari S/N
MAXRIT|2|3|0|Giorni di massimo ritardo
NOTE|1|100|0|Note alla convocazione
NUMCONV|2|4|0|Numero convocati
NUMSOLL|2|4|0|Numero sollecitati
NUMRIT|2|4|0|Numero ritardatari
TUTTI|8|1|0|Convoca anche donatori di altre sez con stesso punto prelievo
MODCONV|1|2|0|Modalita' di convocazione
16
CODPACCO|1|50|0|Codice pacco
CODRIGA|3|6|0|Codice riga
DESCR|1|50|0|Descrizione pacco
CODART|1|20|0|Codice articolo
QTA|4|8|2|Pezzi nella confezione
UM|1|2|0|Unita' di misura
DATA|5|8|0|Data creazione pacco
CODCF|3|6|0|Cliente a cui e' stato dato il pacco
DATABO|5|8|0|Data bolla con cui e' stato evaso il pacco
ANNULLATO|1|1|0|Pacco annullato (S/N)
PROVV|1|1|0|Chiave bolla con cui e' stato evaso il pacco
ANNO|2|4|0|Chiave bolla con cui e' stato evaso il pacco
CODNUM|1|4|0|Chiave bolla con cui e' stato evaso il pacco
NDOC|3|7|0|Chiave bolla con cui e' stato evaso il pacco
IDRIGA|3|6|0|Riga bolla con cui e' stato evaso il pacco
MGNUMREG|3|6|0|Movimento di magazzino legato al pacco
3
NUMERO|
DATA+PUNTO+TIPO+CODSEZ+CODSOT|X
CODSEZ+CODSOT+DATA|X
CODPACCO+CODRIGA|
DATA+CODCF|X
CODART+CODPACCO+CODRIGA|X

2
exe/recdesc/f34.dir
View File

@ -1,3 +1,3 @@
34
0
$rdoc|||614|0|Righe documenti|||
$rdoc|||618|0|Righe documenti|||

2
exe/recdesc/f34.trr
View File

@ -4,7 +4,7 @@ CODNUM|1|4|0|Codice Numeriazione
ANNO|2|4|0|Anno
PROVV|1|1|0|Tipo numerazione <P>rovvisoria <D>efinitiva
NDOC|3|7|0|N. documento
NRIGA|2|3|0|N. riga
NRIGA|2|4|0|N. riga
STATORIGA|1|1|0|Non usato
TIPORIGA|1|3|0|Tipo riga
GENERATA|8|1|0|Riga generata

10387
exe/setup/dninst.zip
View File

File diff suppressed because it is too large Load Diff

BIN
exe/xi.dll
View File

Binary file not shown.

BIN
exe/xvaga.dll
View File

Binary file not shown.

BIN
lib/AgaLib.lib
View File

Binary file not shown.

BIN
lib/Uno.lib
View File

Binary file not shown.

BIN
lib/cb6.exp
View File

Binary file not shown.

BIN
lib/cb6.lib
View File

Binary file not shown.

BIN
lib/gfm.exp
View File

Binary file not shown.

BIN
lib/gfm.lib
View File

Binary file not shown.

BIN
lib/pdflib.exp
View File

Binary file not shown.

BIN
lib/pdflib.lib
View File

Binary file not shown.

BIN
lib/pdflibwrap.lib
View File

Binary file not shown.

BIN
lib/vedoc.lib
View File

Binary file not shown.

BIN
lib/vedocext.lib
View File

Binary file not shown.

BIN
lib/xi.exp
View File

Binary file not shown.

BIN
lib/xi.lib
View File

Binary file not shown.

BIN
lib/xvaga.exp
View File

Binary file not shown.

BIN
lib/xvaga.lib
View File

Binary file not shown.

BIN
lib/xvapp.lib
View File

Binary file not shown.

6
src/ba/ba1100.cpp
View File

@ -675,7 +675,7 @@ void TManutenzione_app::edit_riga (long riga_sel, TToken_string& riga)
const TRecnotype eox = _mask->get_bool(FLD_EXTEND) ? _mask->get_long(FLD_EOX) : oldeox;
TDir& dir = _browse->dir();
dir.get(logicnum, _lock, _nordir, _sysdirop);
dir.get(logicnum, _nolock, _nordir, _sysdirop);
dir.set(dep.SysName, dep.EOD, dep.Flags, dep.Des, dep.FCalc);
dir.put(logicnum, _nordir, _sysdirop);
@ -698,7 +698,7 @@ void TManutenzione_app::edit_riga (long riga_sel, TToken_string& riga)
f.packfile(true);
f.packindex(true);
// le 4 righe seguenti servono per allineare i valori di EOD ed EOX dopo una compattazione forzata
dir.get(logicnum, _lock, _nordir, _sysdirop);
dir.get(logicnum, _nolock, _nordir, _sysdirop);
dir.set(dep.SysName, dep.EOD, dep.Flags, dep.Des, dep.FCalc);
dir.set_eox(_browse->dir().eod());
dir.put(logicnum, _nordir, _sysdirop);
@ -825,7 +825,7 @@ void TManutenzione_app::repair_file(int i)
}
else
{
d.get(i, _lock, _nordir, _sysdirop);
d.get(i, _nolock, _nordir, _sysdirop);
save_file(n);
TExternisamfile ef(n);

2
src/ba/ba1101.cpp
View File

@ -11,7 +11,7 @@ TMask* TRec_sheet::_mask = NULL;
void TDir_sheet::add()
{
_dir.get(LF_DIR, _lock, _nordir, _sysdirop);
_dir.get(LF_DIR, _nolock, _nordir, _sysdirop);
const int nitems = (int)_dir.eod() + 1;
if (_dir.eox() < nitems)

21
src/ca/calib01.cpp
View File

@ -679,11 +679,22 @@ void ca_create_browse1(TEdit_field& kfld, int level, int logic, short key_id, sh
bool req = false;
if ((logic == LF_COMMESSE || logic == LF_CDC) && kfld.mask().get_sheet()) // Sono in una maschera di riga?
{
TConfig& ini = ca_config();
if (logic == LF_COMMESSE)
req = ini.get_bool("CmsRequired");
else
req = ini.get_bool("CdcRequired");
if (main_app().name().starts_with("ci"))
{
if (logic == LF_COMMESSE)
req = ini_get_bool(CONFIG_DITTA, "ci", "CmsRequired");
else
req = ini_get_bool(CONFIG_DITTA, "ci", "CdcRequired");
}
else
{
TConfig& ini = ca_config();
if (logic == LF_COMMESSE)
req = ini.get_bool("CmsRequired");
else
req = ini.get_bool("CdcRequired");
}
}
for (int i = 0; i <= level; i++)

2
src/cg/cg1500.h
View File

@ -35,7 +35,7 @@
#define F_A_DESCRIZIONE 139
#define F_PRINT_FULL_CODE 140
#ifdef CONT_SEP
#define F_CONTSEP 14
#define F_CONTSEP 141
#endif
#endif // __CG1500_H

10
src/cg/cg2100c.uml
View File

@ -223,7 +223,7 @@ BEGIN
OUTPUT F_RICALT RICALT
CHECKTYPE REQUIRED
WARNING "Cliente/Fornitore assente"
ADD RUN cg0 -1 C
ADD RUN cg0 -1
END
@ -241,7 +241,7 @@ BEGIN
DISPLAY "Codice Fiscale@16" COFI
COPY OUTPUT F_CODCLIFOR
CHECKTYPE REQUIRED
ADD RUN cg0 -1 F
ADD RUN cg0 -1
END
@ -259,7 +259,7 @@ BEGIN
DISPLAY "Partita IVA@12" PAIV
COPY OUTPUT F_CODCLIFOR
CHECKTYPE NORMAL
ADD RUN cg0 -1 C
ADD RUN cg0 -1
END
STRING F_PIVA 12
@ -277,7 +277,7 @@ BEGIN
DISPLAY "Codice Fiscale@16" COFI
COPY OUTPUT F_CODCLIFOR
CHECKTYPE NORMAL
ADD RUN cg0 -1 C
ADD RUN cg0 -1
END
STRING F_STATOPAIV 2
@ -306,7 +306,7 @@ BEGIN
DISPLAY "Codice Fiscale@16" COFI
COPY OUTPUT F_CODCLIFOR
CHECKTYPE NORMAL
ADD RUN cg0 -1 C
ADD RUN cg0 -1
GROUP 1
END

1
src/cg/cg2100p.uml
View File

@ -149,7 +149,6 @@ BEGIN
ITEM "Blocco"
ITEM "Causale\nBlocco@6"
ITEM "Motivazione blocco@50"
FLAGS "L"
END
ENDPAGE

4
src/cg/cg2105.cpp
View File

@ -660,6 +660,10 @@ void TGame_mask::init(const TBill& bill, long numreg, int riga)
val.set(*this, P_VALUTA, P_DATACAMBIO, P_CAMBIO);
enable(-3, val.in_valuta());
#endif
if (!ini_get_bool(CONFIG_STUDIO, "cg", "HatTrick"))
sfield(P_SCADENZE).set_read_only(true);
set_handler(P_ANNO, annopart_handler);
set_handler(P_NUMERO, numpart_handler);

14
src/cg/cg3100.cpp
View File

@ -42,6 +42,7 @@ class TListaMov_application : public TPrintapp
TString _descr, _descr_doc, _descr_causale;
#ifdef CONT_SEP
TString _descr_cs;
TString _cont_sep;
#endif
TString _tipo_ini, _causale, _app;
TString4 _causale_ini, _causale_fin, _registro,_registro_ini, _registro_fin;
@ -488,6 +489,11 @@ bool TListaMov_application::filter_func_fatture (const TRelation* rel)
{
const TRectype& mov = rel->curr(LF_MOV);
#ifdef CONT_SEP
if (app()._cont_sep.full() && (app()._cont_sep != mov.get(MOV_CONTSEP)))
return false;
#endif
// Altrimenti stampa anche i corrispettivi! Pseudo errore MI2396
const long codcf = mov.get_long(MOV_CODCF);
if (codcf <= 0)
@ -535,6 +541,11 @@ bool TListaMov_application::filter_func (const TRelation * rel)
return false;
}
#ifdef CONT_SEP
if (app()._cont_sep.full() && (app()._cont_sep != mov.get(MOV_CONTSEP)))
return false;
#endif
const TString& causale = mov.get(MOV_CODCAUS);
if (!between(causale, app()._causale_ini, app()._causale_fin))
return false;
@ -1989,6 +2000,9 @@ void TListaMov_application::imposta_parametri_stampa(const TMask& msk)
_data_fin = msk.get(F_DATAFIN);
_provvis = msk.get_int(F_STAMPAMOVP);
_competence_only = msk.get_bool(F_COMPETENZA);
#ifdef CONT_SEP
_cont_sep = msk.get_bool(F_CONTSEP);
#endif
TRectype da (LF_MOV), a(LF_MOV);
if (_decidi == 1)

3
src/cg/cg3100.h
View File

@ -42,6 +42,9 @@
#define F_DES_DACODIVA 145
#define F_ACODIVA 146
#define F_DES_ACODIVA 147
#ifdef CONT_SEP
#define F_CONTSEP 148
#endif
#define ST_DATA 0x0001
#define ST_NUMERO 0x0002

15
src/cg/cg3100a.uml
View File

@ -226,6 +226,21 @@ BEGIN
ITEM "3|Solo provvisori"
END
#ifdef CONT_SEP
STRING F_CONTSEP 6
BEGIN
PROMPT 2 19 "Contabilità separata "
USE &NPENT
INPUT CODTAB F_CONTSEP
DISPLAY "Codice@6" CODTAB
DISPLAY "Descrizione@50" S0
OUTPUT F_CONTSEP CODTAB
CHECKTYPE REQUIRED
MODULE NP
END
#endif
ENDPAGE
ENDMASK

15
src/cg/cg3100b.uml
View File

@ -306,6 +306,21 @@ BEGIN
COPY OUTPUT F_ACODIVA
END
#ifdef CONT_SEP
STRING F_CONTSEP 6
BEGIN
PROMPT 2 18 "Contabilità separata "
USE &NPENT
INPUT CODTAB F_CONTSEP
DISPLAY "Codice@6" CODTAB
DISPLAY "Descrizione@50" S0
OUTPUT F_CONTSEP CODTAB
CHECKTYPE REQUIRED
MODULE NP
END
#endif
ENDPAGE
ENDMASK

19
src/cg/cg3200.cpp
View File

@ -97,7 +97,9 @@ class TMastrini_application : public TPrintapp
TString _descrizione,_sezione,_numdoc,_descrizionemov,_numrivd,_descr;
TString _dataregs, _datadocs;
int _gruppocontr,_contocontr,_nummast,_pagina;
#ifdef _CONT_SEP
TString _cont_sep;
#endif
long _sottocontocontr;
bool _stampaprogre,_stampatotiva,_stampatot,_stampa_mov_prov, _stampa_cont;
@ -2249,6 +2251,17 @@ bool TMastrini_application::set_print(int m)
// Se lo sheet e' vuoto allora usa solo la maschera corrente per la stampa,
// altrimenti estrae il primo elemento sovrascrivendo la maschera corrente.
// Questa figata cerca di correggere gli errori MI6185 e MI3592 in una botta
#ifdef CONT_SEP
TString cont_sep = _msk->get(F_CONTSEP);
if (cont_sep.full())
{
TString filter("(FLSCA!=\" \")");
filter << "&&(CONTSEP==\"" << cont_sep << "\")";
current_cursor()->setfilter(filter);
}
#endif
TSheet_field& sht = _msk->sfield(F_SCELTE);
if (sht.items() != 0)
sheet2mask(); // Estrae la prima riga dalla coda di stampa
@ -3685,10 +3698,12 @@ bool TMastrini_application::user_create()
_rel->add("CMS", "CODTAB==CODCMS", 1, LF_RMOV, 501);
_rel->add("FSC", "CODTAB==FASCMS", 1, LF_RMOV, 502);
_cur1=add_cursor(new TCursor(_rel, "FLSCA<=\" \"",2));
TString filter("FLSCA<=\" \"");
_cur1=add_cursor(new TCursor(_rel, filter, 2));
open_files(LF_TAB, LF_TABCOM,LF_NDITTE, LF_UNLOC, LF_COMUNI, LF_MOV,
LF_CLIFO, LF_CAUSALI, 0);
_cur2=add_cursor(new TSorted_cursor(_rel, "DESCR","FLSCA<=\" \"",2));
_cur2=add_cursor(new TSorted_cursor(_rel, "DESCR", filter, 2));
_tabivd = new TTable (TAB_IVD);
_tabtpd = new TTable (TAB_TPD);

14
src/cg/cg3200a.uml
View File

@ -503,6 +503,20 @@ BEGIN
ITEM "3|Continua"
END
#ifdef CONT_SEP
STRING F_CONTSEP 6
BEGIN
PROMPT 2 19 "Contabilità separata "
USE &NPENT
INPUT CODTAB F_CONTSEP
DISPLAY "Codice@6" CODTAB
DISPLAY "Descrizione@50" S0
OUTPUT F_CONTSEP CODTAB
CHECKTYPE NORMAL
MODULE NP
END
#endif
BOOLEAN F_SEPARATOR
BEGIN
PROMPT 40 17 "Non stampare il separatore delle migliaia"

24
src/cg/cg3600.cpp
View File

@ -379,7 +379,15 @@ void TMastrino::read(const TBill& conto,
TRectype darow(rmov_rec), arow(rmov_rec);
darow.put(RMV_DATAREG, inizio_esercizio);
arow.put(RMV_DATAREG, max_data_reg);
TCursor cur(&rel(), "", 2, &darow, &arow);
TString filter;
#ifdef CONT_SEP
TString cont_sep = app().query_mask().get(F_CONTSEP);
if (cont_sep.full())
filter << "23->CONTSEP==\"" << cont_sep << "\"";
#endif
TCursor cur(&rel(), filter, 2, &darow, &arow);
const TRecnotype totrows = cur.items();
cur.freeze();
@ -2243,8 +2251,12 @@ TMastrino_set::TMastrino_set(TMastrini_grid& g)
add_field(_datefld,-101, 10); // Data comp
add_field(_alfafld, 102, 1); // Movimento di competenza?
add_field(_alfafld, 103, 25); // Causale
add_field(_alfafld, 104, 50); // Descrizione
add_field(_realfld, 105, 13); // Dare
#ifdef CONT_SEP
add_field(_alfafld, 104, 100); // Descrizione
#else
add_field(_alfafld, 104, 50); // Descrizione
#endif
add_field(_realfld, 105, 13); // Dare
add_field(_realfld, 106, 13); // Avere
add_field(_alfafld, 107, 7); // Num doc
add_field(_longfld,-107, 7); // Num prot
@ -2287,7 +2299,11 @@ public:
TGrid_mask::TGrid_mask()
: _grid(NULL)
{
read_mask("cg3600b", 0, 0);
#ifdef CONT_SEP
read_mask("np0500b", 0, 0);
#else
read_mask("cg3600b", 0, 0);
#endif
set_handler(DLG_LINK, link_handler);
set_handler(DLG_NEWREC, new_handler);
set_handler(DLG_EDIT, edit_handler);

2
src/cg/cg3600.h
View File

@ -27,7 +27,7 @@
#define F_ADESCAUS 116
#define F_PROVVIS 117
#ifdef CONT_SEP
#define F_ST_CONTSEP 118
#define F_CONTSEP 118
#define F_END 119
#else
#define F_END 118

15
src/cg/cg3600a.uml
View File

@ -378,6 +378,21 @@ BEGIN
GROUP 5
END
#ifdef CONT_SEP
STRING F_CONTSEP 6
BEGIN
PROMPT 2 18 "Contabilità separata "
USE &NPENT
INPUT CODTAB F_CONTSEP
DISPLAY "Codice@6" CODTAB
DISPLAY "Descrizione@50" S0
OUTPUT F_CONTSEP CODTAB
CHECKTYPE NORMAL
MODULE NP
END
#endif
ENDPAGE
ENDMASK

Some files were not shown because too many files have changed in this diff Show More