Merge branch 'R_10_00' of http://10.65.20.17:7990/scm/campo/campo into R_10_00
This commit is contained in:
Mattia Tollari
commit
281c3ee091
@ -87,6 +87,7 @@
|
||||
<TargetMachine>MachineX86</TargetMachine>
|
||||
<Version>12.0</Version>
|
||||
<ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
|
||||
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
|
||||
</Link>
|
||||
<Bscmake>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
|
||||
@ -147,6 +147,7 @@
|
||||
<TargetMachine>MachineX86</TargetMachine>
|
||||
<Version>12.0</Version>
|
||||
<ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
|
||||
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
|
||||
</Link>
|
||||
<Bscmake>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
|
||||
@ -91,6 +91,7 @@
|
||||
<TargetMachine>MachineX86</TargetMachine>
|
||||
<Version>12.0</Version>
|
||||
<ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
|
||||
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
|
||||
</Link>
|
||||
<Bscmake>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
|
||||
@ -142,6 +142,7 @@
|
||||
<Version>12.0</Version>
|
||||
<ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
|
||||
<ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
|
||||
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
|
||||
</Link>
|
||||
<Bscmake>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
|
||||
@ -93,6 +93,7 @@
|
||||
<TargetMachine>MachineX86</TargetMachine>
|
||||
<Version>12.0</Version>
|
||||
<ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
|
||||
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
|
||||
</Link>
|
||||
<Bscmake>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
|
||||
@ -92,6 +92,7 @@
|
||||
<TargetMachine>MachineX86</TargetMachine>
|
||||
<Version>12.0</Version>
|
||||
<ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
|
||||
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
|
||||
</Link>
|
||||
<Bscmake>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
|
||||
@ -93,6 +93,7 @@
|
||||
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
|
||||
<Version>12.0</Version>
|
||||
<ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
|
||||
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
|
||||
</Link>
|
||||
<Bscmake>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
|
||||
@ -143,6 +143,7 @@
|
||||
<TargetMachine>MachineX86</TargetMachine>
|
||||
<Version>12.0</Version>
|
||||
<ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
|
||||
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
|
||||
</Link>
|
||||
<Bscmake>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
|
||||
@ -94,6 +94,7 @@
|
||||
<Version>12.0</Version>
|
||||
<ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
|
||||
<ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
|
||||
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
|
||||
</Link>
|
||||
<Bscmake>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
|
||||
@ -231,6 +231,7 @@
|
||||
<TrrCompiler Include="..\src\cg\f16.trr" />
|
||||
<TrrCompiler Include="..\src\cg\f17.trr" />
|
||||
<TrrCompiler Include="..\src\cg\f171.trr" />
|
||||
<TrrCompiler Include="..\src\cg\f175.trr" />
|
||||
<TrrCompiler Include="..\src\cg\f18.trr" />
|
||||
<TrrCompiler Include="..\src\cg\f19.trr" />
|
||||
<TrrCompiler Include="..\src\cg\f20.trr" />
|
||||
@ -252,6 +253,7 @@
|
||||
<DirCompiler Include="..\src\cg\f16.dir" />
|
||||
<DirCompiler Include="..\src\cg\f17.dir" />
|
||||
<DirCompiler Include="..\src\cg\f171.dir" />
|
||||
<DirCompiler Include="..\src\cg\f175.dir" />
|
||||
<DirCompiler Include="..\src\cg\f18.dir" />
|
||||
<DirCompiler Include="..\src\cg\f19.dir" />
|
||||
<DirCompiler Include="..\src\cg\f20.dir" />
|
||||
|
||||
@ -147,6 +147,9 @@
|
||||
<TrrCompiler Include="..\src\cg\f98.trr">
|
||||
<Filter>Trr</Filter>
|
||||
</TrrCompiler>
|
||||
<TrrCompiler Include="..\src\cg\f175.trr">
|
||||
<Filter>Trr</Filter>
|
||||
</TrrCompiler>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<DirCompiler Include="..\src\cg\f103.dir">
|
||||
@ -206,6 +209,9 @@
|
||||
<DirCompiler Include="..\src\cg\f98.dir">
|
||||
<Filter>Dir</Filter>
|
||||
</DirCompiler>
|
||||
<DirCompiler Include="..\src\cg\f175.dir">
|
||||
<Filter>Dir</Filter>
|
||||
</DirCompiler>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\src\cg\cg0.h">
|
||||
|
||||
@ -302,7 +302,9 @@
|
||||
</CustomBuild>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<RepCompiler Include="..\src\cg\cg5500a.rep" />
|
||||
<RepCompiler Include="..\src\cg\cg5500a.rep">
|
||||
<SubType>Designer</SubType>
|
||||
</RepCompiler>
|
||||
<RepCompiler Include="..\src\cg\cg5500b.rep" />
|
||||
<RepCompiler Include="..\src\cg\cg5800a.rep" />
|
||||
<RepCompiler Include="..\src\cg\cg5800b.rep">
|
||||
|
||||
@ -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>{BBB4EEFA-F24B-4B6C-9632-D7F42283869D}</ProjectGuid>
|
||||
<RootNamespace>or1</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">
|
||||
|
||||
@ -94,6 +94,7 @@
|
||||
<TargetMachine>MachineX86</TargetMachine>
|
||||
<Version>12.0</Version>
|
||||
<ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
|
||||
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
|
||||
</Link>
|
||||
<Bscmake>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
|
||||
@ -147,6 +147,7 @@
|
||||
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
|
||||
<Version>12.0</Version>
|
||||
<ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
|
||||
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
|
||||
</Link>
|
||||
<Bscmake>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
|
||||
@ -147,6 +147,7 @@
|
||||
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
|
||||
<Version>12.0</Version>
|
||||
<ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
|
||||
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
|
||||
</Link>
|
||||
<Bscmake>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
|
||||
@ -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>{9C91BACF-9A70-4973-B8CC-FA3D2AF9867C}</ProjectGuid>
|
||||
<RootNamespace>ci0</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">
|
||||
@ -79,7 +82,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>
|
||||
@ -93,6 +96,7 @@
|
||||
<TargetMachine>MachineX86</TargetMachine>
|
||||
<ProgramDatabaseFile>$(IntDir)</ProgramDatabaseFile>
|
||||
<ProfileGuidedDatabase>$(IntDir)</ProfileGuidedDatabase>
|
||||
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
|
||||
</Link>
|
||||
<Bscmake>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
|
||||
@ -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>{0F684C8A-5184-44B2-8BAB-F234546ED1BA}</ProjectGuid>
|
||||
<RootNamespace>ci1</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">
|
||||
@ -74,7 +77,7 @@
|
||||
<ResourceCompile>
|
||||
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<Culture>0x0410</Culture>
|
||||
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
</ResourceCompile>
|
||||
<Link>
|
||||
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
||||
@ -86,6 +89,7 @@
|
||||
<TargetMachine>MachineX86</TargetMachine>
|
||||
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<ProfileGuidedDatabase>$(IntDir)</ProfileGuidedDatabase>
|
||||
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
|
||||
</Link>
|
||||
<Bscmake>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
|
||||
@ -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>{DE1487DC-4C9B-4150-BFE1-A79D6FE7B840}</ProjectGuid>
|
||||
<RootNamespace>ci2</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">
|
||||
@ -70,16 +73,14 @@
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
||||
<StringPooling>true</StringPooling>
|
||||
<PrecompiledHeaderOutputFile>$(IntDir)</PrecompiledHeaderOutputFile>
|
||||
<AssemblerListingLocation>
|
||||
</AssemblerListingLocation>
|
||||
<ProgramDataBaseFileName>
|
||||
</ProgramDataBaseFileName>
|
||||
<PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
|
||||
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
|
||||
<ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
|
||||
</ClCompile>
|
||||
<ResourceCompile>
|
||||
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<Culture>0x0410</Culture>
|
||||
<AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
</ResourceCompile>
|
||||
<Link>
|
||||
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
||||
@ -89,6 +90,7 @@
|
||||
</DataExecutionPrevention>
|
||||
<TargetMachine>MachineX86</TargetMachine>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
|
||||
</Link>
|
||||
<Bscmake>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
|
||||
@ -53,6 +53,12 @@
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<PreBuildEventUseInBuild>true</PreBuildEventUseInBuild>
|
||||
<SrcSimpleCompilerBeforeTargets>Midl</SrcSimpleCompilerBeforeTargets>
|
||||
<SrcSimpleCompilerAfterTargets>CustomBuild</SrcSimpleCompilerAfterTargets>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<SrcSimpleCompilerBeforeTargets>Midl</SrcSimpleCompilerBeforeTargets>
|
||||
<SrcSimpleCompilerAfterTargets>CustomBuild</SrcSimpleCompilerAfterTargets>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<Midl>
|
||||
@ -158,9 +164,9 @@
|
||||
<SrcCompiler Include="..\src\ve\ordbon.src" />
|
||||
<SrcCompiler Include="..\src\ve\ordinec.src" />
|
||||
<SrcCompiler Include="..\src\ve\ordinef.src" />
|
||||
<SrcCompiler Include="..\src\ve\ve0300a.src">
|
||||
<SrcSimpleCompiler Include="..\src\ve\ve0300a.src">
|
||||
<FileType>Document</FileType>
|
||||
</SrcCompiler>
|
||||
</SrcSimpleCompiler>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<DatCompiler Include="..\src\ve\ve0300b.dat" />
|
||||
|
||||
4
cd/test/ba0616.txt
Normal file
4
cd/test/ba0616.txt
Normal file
@ -0,0 +1,4 @@
|
||||
recdesc\f23.trr
|
||||
recdesc\f23.dir
|
||||
|
||||
Ridistribuito tracciato file 23 ( Diana 2000)
|
||||
32
cd/test/ba0616a.ini
Normal file
32
cd/test/ba0616a.ini
Normal file
@ -0,0 +1,32 @@
|
||||
[Main]
|
||||
Demo=0
|
||||
|
||||
[ba2]
|
||||
File(332) = recdesc\f23.dir|X
|
||||
File(333) = recdesc\f23.trr|X
|
||||
Patch = 616
|
||||
Versione = 21511200
|
||||
|
||||
[ba99]
|
||||
Kill(0) = batbsce.txt|x
|
||||
Kill(1) = wxmsw240.dll|x
|
||||
Kill(2) = bastcms.rep|x
|
||||
Kill(3) = bastcms.msk|x
|
||||
Kill(4) = bastfsc.msk|x
|
||||
Kill(5) = bastfsc.rep|x
|
||||
Kill(6) = bastuue.msk|x
|
||||
Kill(7) = bastuue.rep|x
|
||||
|
||||
[ba]
|
||||
Data = 26-08-2018
|
||||
Descrizione = Base
|
||||
Dischi = 1
|
||||
Moduli = sy
|
||||
OEM =
|
||||
Patch = 616
|
||||
PostProcess = bainst -0 BA
|
||||
PreProcess =
|
||||
Prezzo(1) =
|
||||
Prezzo(2) =
|
||||
Versione = 21511200
|
||||
|
||||
BIN
cd/test/ba0616a1.zip
Normal file
BIN
cd/test/ba0616a1.zip
Normal file
Binary file not shown.
9
cd/test/cg0616.txt
Normal file
9
cd/test/cg0616.txt
Normal file
@ -0,0 +1,9 @@
|
||||
cg5.exe
|
||||
cg5500d.msk
|
||||
cg5500b.msk
|
||||
cg5500b.rep
|
||||
cg5500a.rep
|
||||
cg0200a.msk
|
||||
cg0.exe
|
||||
|
||||
Aggiunta colonna con iva da versare/a credito. camibato il contenuto della prima con il risultato
|
||||
108
cd/test/cg0616a.ini
Normal file
108
cd/test/cg0616a.ini
Normal file
@ -0,0 +1,108 @@
|
||||
[Main]
|
||||
Demo=0
|
||||
|
||||
[cg1]
|
||||
Edit_23 = cg2 -0
|
||||
File(60) = cg5.exe|X
|
||||
File(68) = cg5500b.msk|X
|
||||
File(70) = cg5500d.msk|X
|
||||
File(228) = cg5500a.rep|X
|
||||
File(229) = cg5500b.rep|X
|
||||
Patch = 616
|
||||
Versione = 21511200
|
||||
|
||||
[cg9]
|
||||
Edit_19 = cg0 -0
|
||||
Edit_20 = cg0 -1
|
||||
Edit_26 = cg0 -4
|
||||
Edit_5 = cg0 -5
|
||||
File(127) = cg0.exe|X
|
||||
File(129) = cg0200a.msk|X
|
||||
Patch = 616
|
||||
Versione = 21511200
|
||||
|
||||
[cg99]
|
||||
Kill(0) = batbcfi.msk|x
|
||||
Kill(1) = batbscc.msk|x
|
||||
Kill(2) = bastleg.rep|x
|
||||
Kill(3) = batbpor.msk|x
|
||||
Kill(4) = batbivd.msk|x
|
||||
Kill(5) = bastzon.rep|x
|
||||
Kill(6) = batbarb.msk|x
|
||||
Kill(7) = batblia.msk|x
|
||||
Kill(8) = bastcfi.rep|x
|
||||
Kill(9) = bastcam.rep|x
|
||||
Kill(10) = bastreg.rep|x
|
||||
Kill(11) = bastmsp.rep|x
|
||||
Kill(12) = bastmsp.msk|x
|
||||
Kill(13) = bastcco.msk|x
|
||||
Kill(14) = bastpor.msk|x
|
||||
Kill(15) = batbcve.msk|x
|
||||
Kill(16) = batbleg.msk|x
|
||||
Kill(17) = batbtit.msk|x
|
||||
Kill(18) = bastesc.msk|x
|
||||
Kill(19) = bastndo.msk|x
|
||||
Kill(20) = batbind.msk|x
|
||||
Kill(21) = batbndo.msk|x
|
||||
Kill(22) = bastcco.rep|x
|
||||
Kill(23) = bastntb.rep|x
|
||||
Kill(24) = bastscc.msk|x
|
||||
Kill(25) = batblbu.msk|x
|
||||
Kill(26) = bastndo.rep|x
|
||||
Kill(27) = bastcve.msk|x
|
||||
Kill(28) = bastarb.msk|x
|
||||
Kill(29) = batbtra.msk|x
|
||||
Kill(30) = bastvet.msk|x
|
||||
Kill(31) = bastzon.msk|x
|
||||
Kill(32) = batbvet.msk|x
|
||||
Kill(33) = batbntb.msk|x
|
||||
Kill(34) = bastpdb.rep|x
|
||||
Kill(35) = bastcfi.msk|x
|
||||
Kill(36) = bastnot.rep|x
|
||||
Kill(37) = batbver.msk|x
|
||||
Kill(38) = bastcam.msk|x
|
||||
Kill(39) = bastesc.rep|x
|
||||
Kill(40) = cgtbcon.msk|x
|
||||
Kill(41) = bastarb.rep|x
|
||||
Kill(42) = batbinl.msk|x
|
||||
Kill(43) = batblia.msk|x
|
||||
Kill(44) = batbreg.msk|x
|
||||
Kill(45) = batbdel.msk|x
|
||||
Kill(46) = bastreg.msk|x
|
||||
Kill(47) = batbnot.msk|x
|
||||
Kill(48) = bastleg.msk|x
|
||||
Kill(49) = bastvet.rep|x
|
||||
Kill(50) = bastivd.rep|x
|
||||
Kill(51) = bastver.rep|x
|
||||
Kill(52) = batbzon.msk|x
|
||||
Kill(53) = bastntb.msk|x
|
||||
Kill(54) = bastivd.msk|x
|
||||
Kill(55) = bastpdb.msk|x
|
||||
Kill(56) = bastdpn.msk|x
|
||||
Kill(57) = bastdpn.rep|x
|
||||
Kill(58) = bastpor.rep|x
|
||||
Kill(59) = bastnot.msk|x
|
||||
Kill(60) = batbdpn.msk|x
|
||||
Kill(61) = batbesc.msk|x
|
||||
Kill(62) = bastcve.rep|x
|
||||
Kill(63) = batbmsp.msk|x
|
||||
Kill(64) = batbpdb.msk|x
|
||||
Kill(65) = batbcam.msk|x
|
||||
Kill(66) = bastscc.rep|x
|
||||
Kill(67) = batbins.msk|x
|
||||
Kill(68) = batbcco.msk|x
|
||||
Kill(69) = bastver.msk|x
|
||||
|
||||
[cg]
|
||||
Data = 26-08-2018
|
||||
Descrizione = Contabilita' Generale
|
||||
Dischi = 1
|
||||
Moduli = ba
|
||||
OEM =
|
||||
Patch = 616
|
||||
PostProcess = bainst -0 CG
|
||||
PreProcess =
|
||||
Prezzo(1) =
|
||||
Prezzo(2) =
|
||||
Versione = 21511200
|
||||
|
||||
BIN
cd/test/cg0616a1.zip
Normal file
BIN
cd/test/cg0616a1.zip
Normal file
Binary file not shown.
5
cd/test/np0616.txt
Normal file
5
cd/test/np0616.txt
Normal file
@ -0,0 +1,5 @@
|
||||
np0.exe
|
||||
npmenu.men
|
||||
|
||||
Corretti saldi iniziali mastrini per contabilità separata.
|
||||
Aggiunta chiusura al menu
|
||||
21
cd/test/np0616a.ini
Normal file
21
cd/test/np0616a.ini
Normal file
@ -0,0 +1,21 @@
|
||||
[Main]
|
||||
Demo=0
|
||||
|
||||
[np0]
|
||||
Edit_163 = np0 -0
|
||||
File(0) = np0.exe|X
|
||||
File(6) = npmenu.men|X
|
||||
Patch = 616
|
||||
Versione = 21511200
|
||||
|
||||
[np]
|
||||
Data = 10-01-2017
|
||||
Descrizione = Contabilità separata
|
||||
Dischi = 1
|
||||
Moduli = cg
|
||||
OEM =
|
||||
Patch = 616
|
||||
PostProcess =
|
||||
PreProcess =
|
||||
Versione = 21511200
|
||||
|
||||
BIN
cd/test/np0616a1.zip
Normal file
BIN
cd/test/np0616a1.zip
Normal file
Binary file not shown.
@ -97,7 +97,7 @@ class TMastrini_application : public TPrintapp
|
||||
TString _descrizione,_sezione,_numdoc,_descrizionemov,_numrivd,_descr;
|
||||
TString _dataregs, _datadocs;
|
||||
int _gruppocontr,_contocontr,_nummast,_pagina;
|
||||
#ifdef _CONT_SEP
|
||||
#ifdef CONT_SEP
|
||||
TString _cont_sep;
|
||||
#endif
|
||||
long _sottocontocontr;
|
||||
@ -1451,7 +1451,10 @@ bool TMastrini_application::preprocess_page(int file, int counter)
|
||||
|
||||
|
||||
_dataregs = _datareg_stampa.string();
|
||||
|
||||
#ifdef CONT_SEP
|
||||
if (_cont_sep.full() && _cont_sep != mov.get(MOV_CONTSEP))
|
||||
return false;
|
||||
#endif
|
||||
if ((_stampa_mov_prov)||((!_stampa_mov_prov)&&(provvis.blank())))
|
||||
{
|
||||
if ((_datareg >= _data_ini) && (_datareg <= _data_fine))
|
||||
@ -2257,15 +2260,15 @@ bool TMastrini_application::set_print(int m)
|
||||
// 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);
|
||||
_cont_sep = _msk->get(F_CONTSEP);
|
||||
|
||||
if (cont_sep.full())
|
||||
/* if (_cont_sep.full())
|
||||
{
|
||||
TString filter("(FLSCA!=\" \")");
|
||||
|
||||
filter << "&&(CONTSEP==\"" << cont_sep << "\")";
|
||||
filter << "&&(" << LF_MOV << "->CONTSEP==\"" << _cont_sep << "\")";
|
||||
current_cursor()->setfilter(filter);
|
||||
}
|
||||
} */
|
||||
#endif
|
||||
TSheet_field& sht = _msk->sfield(F_SCELTE);
|
||||
if (sht.items() != 0)
|
||||
@ -2933,13 +2936,15 @@ void TMastrini_application::calcola_progressivi_al(const TDate& data_fin)
|
||||
|
||||
const TDate data_inizio = _annomsk ? _data_inizioese : _inizioes;
|
||||
|
||||
if (_annomsk == _last_year && data_inizio == _last_inizio && data_fin == _last_date &&
|
||||
#ifndef CONT_SEP
|
||||
if (_annomsk == _last_year && data_inizio == _last_inizio && data_fin == _last_date &&
|
||||
_last_provv == _stampa_mov_prov && _last_bill == TBill(_gruppo, _conto, _sottoc))
|
||||
{
|
||||
_totale_prima_dare = _last_dare;
|
||||
_totale_prima_avere = _last_avere;
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
TLocalisamfile& rmov_file = current_cursor()->file(LF_RMOV);
|
||||
const TRecnotype record = rmov_file.recno();
|
||||
@ -2969,15 +2974,18 @@ void TMastrini_application::calcola_progressivi_al(const TDate& data_fin)
|
||||
const TDate datareg = mov.get_date(_annomsk ? MOV_DATACOMP : RMV_DATAREG);
|
||||
|
||||
//Legge movimenti con data > inizio esercizio e < data_fin
|
||||
if (((annoes==_annomsk)||(_annomsk == 0))&&(datareg >= data_inizio)&&(datareg <= data_fin))
|
||||
{
|
||||
const char sezione = rmov.get_char(RMV_SEZIONE);
|
||||
const real importo = rmov.get_real(RMV_IMPORTO);
|
||||
if (sezione == 'D')
|
||||
_totale_prima_dare += importo;
|
||||
else
|
||||
_totale_prima_avere += importo;
|
||||
}
|
||||
#ifdef CONT_SEP
|
||||
if (_cont_sep.blank() || _cont_sep == mov.get(MOV_CONTSEP))
|
||||
#endif
|
||||
if (((annoes==_annomsk)||(_annomsk == 0))&&(datareg >= data_inizio)&&(datareg <= data_fin))
|
||||
{
|
||||
const char sezione = rmov.get_char(RMV_SEZIONE);
|
||||
const real importo = rmov.get_real(RMV_IMPORTO);
|
||||
if (sezione == 'D')
|
||||
_totale_prima_dare += importo;
|
||||
else
|
||||
_totale_prima_avere += importo;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -3026,6 +3034,15 @@ void TMastrini_application::calcola_progressivi(bool finali)
|
||||
//Calcola i progressivi dell'esercizio attuale
|
||||
if (annoes_saldi == _anno_corrente)
|
||||
{
|
||||
#ifdef CONT_SEP
|
||||
TDate datalim;
|
||||
|
||||
_sld->saldo_cont_sep(_gruppo, _conto, _sottoc, annoes_saldi, esercizi().esercizio(annoes_saldi).fine(), _indbil, _cont_sep, _stampa_mov_prov);
|
||||
saldo = _sld->saldo();
|
||||
saldoini_attuale = saldo;
|
||||
saldofine_attuale = _sld->saldofin();
|
||||
|
||||
#else
|
||||
progdare_attuale = saldi.get_real(SLD_PDARE);
|
||||
progavere_attuale = saldi.get_real(SLD_PAVERE);
|
||||
if (_stampa_mov_prov)
|
||||
@ -3035,13 +3052,14 @@ void TMastrini_application::calcola_progressivi(bool finali)
|
||||
}
|
||||
|
||||
saldo = saldi.get_real(SLD_SALDO);
|
||||
salini = saldi.get(SLD_FLAGSALINI)[0];
|
||||
_ultima_data_reg = saldi.get_date(SLD_DATAULMOV);
|
||||
saldoini_attuale = saldi.get_real(SLD_SALDO);
|
||||
salini_attuale = saldi.get_char(SLD_FLAGSALINI);
|
||||
saldofine_attuale = saldi.get_real(SLD_SALDOFIN);
|
||||
salfine_attuale = saldi.get_char(SLD_FLAGSALFIN);
|
||||
}
|
||||
saldoini_attuale = saldi.get_real(SLD_SALDO);
|
||||
saldofine_attuale = saldi.get_real(SLD_SALDOFIN);
|
||||
#endif
|
||||
salini = saldi.get(SLD_FLAGSALINI)[0];
|
||||
_ultima_data_reg = saldi.get_date(SLD_DATAULMOV);
|
||||
salini_attuale = saldi.get_char(SLD_FLAGSALINI);
|
||||
salfine_attuale = saldi.get_char(SLD_FLAGSALFIN);
|
||||
}
|
||||
} // if (!saldi.get_bool(SLD_FLSCA))
|
||||
} // FOR
|
||||
|
||||
@ -3051,24 +3069,38 @@ void TMastrini_application::calcola_progressivi(bool finali)
|
||||
if (_annomsk != 0)
|
||||
{
|
||||
if ((_indbil == 1) || (_indbil == 2) || (_indbil == 5))
|
||||
{
|
||||
const TRecnotype pos = saldi.recno();
|
||||
{
|
||||
const TRecnotype pos = saldi.recno();
|
||||
|
||||
#ifdef CONT_SEP
|
||||
const int esp = esercizi().pred(_anno_corrente);
|
||||
|
||||
_sld->saldo_cont_sep(_gruppo, _conto, _sottoc, esp, esercizi().esercizio(esp).fine(), _indbil, _cont_sep, _stampa_mov_prov, true);
|
||||
saldo = _sld->saldo();
|
||||
#else
|
||||
|
||||
// W96SALDI del 18-07-96 saldofin_esprec usa il flag TRUE xche' deve
|
||||
// considerare anche il saldo finale
|
||||
saldo = _sld->saldofin_esprec(_anno_corrente,_gruppo,_conto,_sottoc,TRUE, _stampa_mov_prov);
|
||||
saldi.readat(pos);
|
||||
|
||||
if (saldo > ZERO)
|
||||
{
|
||||
progredare_eseprec = saldo;
|
||||
progdare_prec = saldo;
|
||||
}
|
||||
else if (saldo < ZERO)
|
||||
{
|
||||
saldo = -saldo;
|
||||
progreavere_eseprec = saldo;
|
||||
progavere_prec = saldo;
|
||||
}
|
||||
#endif
|
||||
saldi.readat(pos);
|
||||
|
||||
if (saldo > ZERO)
|
||||
{
|
||||
progredare_eseprec = saldo;
|
||||
progdare_prec = saldo;
|
||||
progreavere_eseprec = ZERO;
|
||||
progavere_prec = ZERO;
|
||||
|
||||
}
|
||||
else if (saldo < ZERO)
|
||||
{
|
||||
progredare_eseprec = ZERO;
|
||||
progdare_prec = ZERO;
|
||||
saldo = -saldo;
|
||||
progreavere_eseprec = saldo;
|
||||
progavere_prec = saldo;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -3699,6 +3731,7 @@ bool TMastrini_application::user_create()
|
||||
exp.add("CONTO=CONTO");
|
||||
exp.add("SOTTOCONTO=SOTTOCONTO");
|
||||
_rel->add(LF_RMOV,exp,2,LF_SALDI);
|
||||
_rel->add(LF_MOV, "NUMREG==NUMREG", 1, LF_RMOV);
|
||||
|
||||
_rel->add("CMS", "CODTAB==CODCMS", 1, LF_RMOV, 501);
|
||||
_rel->add("FSC", "CODTAB==FASCMS", 1, LF_RMOV, 502);
|
||||
|
||||
@ -344,7 +344,29 @@ void TMastrino::read(const TBill& conto,
|
||||
// vanno dall'inizio dell'esercizio al giorno precedente
|
||||
// la data di inizio stampa
|
||||
|
||||
TBalance saldo(_conto, ae, true, provvis);
|
||||
#ifdef CONT_SEP
|
||||
TSaldo saldo;
|
||||
int aep = esercizi.pred(ae);
|
||||
|
||||
saldo.saldo_cont_sep(_conto.gruppo(), _conto.conto(), _conto.sottoconto(), aep, esercizi.esercizio(aep).fine(), _conto.indicatore_bilancio(), app().query_mask().get(F_CONTSEP), provvis, true);
|
||||
real saldoini = saldo.saldo();
|
||||
if (saldoini > ZERO)
|
||||
{
|
||||
_pdare_ini = saldoini;
|
||||
_pavere_ini = ZERO;
|
||||
}
|
||||
else
|
||||
{
|
||||
_pdare_ini = ZERO;
|
||||
_pavere_ini = -saldoini;
|
||||
}
|
||||
|
||||
// Valori dei saldi finali:
|
||||
// Comprendono i movimenti di apertura, chiusura ed i progressivi attuali
|
||||
_pdare_fin = saldo.prgdare();
|
||||
_pavere_fin = saldo.prgavere();
|
||||
#else
|
||||
TBalance saldo(_conto, ae, true, provvis);
|
||||
_pdare_ini = saldo.progressivo_dare_iniziale();
|
||||
_pavere_ini = saldo.progressivo_avere_iniziale();
|
||||
|
||||
@ -353,6 +375,7 @@ void TMastrino::read(const TBill& conto,
|
||||
saldo.read(_conto, ae, false, provvis);
|
||||
_pdare_fin = saldo.progressivo_dare_finale();
|
||||
_pavere_fin = saldo.progressivo_avere_finale();
|
||||
#endif
|
||||
|
||||
// Valori dei saldi del perido in esame:
|
||||
// Vengono inizializzati a zero e poi si incrementa man mano
|
||||
|
||||
@ -367,7 +367,7 @@ void Visliq_app::print()
|
||||
book.add(rep);
|
||||
rep.load("cg5500b");
|
||||
r = rep.recordset();
|
||||
r->set_var("#FILTER", key, true);
|
||||
r->set_var("#FILTER", key1, true);
|
||||
r->set_var("#ANNO", TVariant((long)year()), true);
|
||||
book.add(rep);
|
||||
book.print_or_preview();
|
||||
@ -613,7 +613,7 @@ bool Visliq_app::vis_all()
|
||||
|
||||
for (int id = 108; shm.id2pos(id) > 0; id++)
|
||||
{
|
||||
if ((id > 107 && id <= 110) || id == 112)
|
||||
if ((id > 107 && id <= 110) || id == 114)
|
||||
sh.enable_column(id, true);
|
||||
}
|
||||
}
|
||||
@ -1436,18 +1436,20 @@ void Visliq_app::recalc_next_liq(int start_month, TSheet_field* sl, TSheet_field
|
||||
TToken_string& t = sl->row(row);
|
||||
t.add(itoname(i),0);
|
||||
|
||||
const real r0 = _lim->get_real("R0");
|
||||
|
||||
const real iva_ven = _lam->get_real("R0"); // IVA acquisti
|
||||
const real iva_acq = _lam->get_real("R1"); // IVA vendite
|
||||
const real ris = iva_ven - iva_acq;
|
||||
|
||||
t.add(abs(ris).string(), 1);
|
||||
const real r1 = _lim->get_real("R1");
|
||||
bool enable_date = !r1.is_zero();
|
||||
const real r5 = _lim->get_real("R5");
|
||||
|
||||
real absv = abs(r0);
|
||||
t.add(absv, 1);
|
||||
if (!r0.is_zero())
|
||||
t.add(r0 > ZERO ? "D" : "C", 2);
|
||||
|
||||
t.add(ris == ZERO ? "" : (ris > ZERO ? "D" : "C"), 2);
|
||||
t.add(r1, 3);
|
||||
absv = abs(r5);
|
||||
t.add(absv, 4);
|
||||
t.add(abs(r5), 4);
|
||||
if (!r5.is_zero())
|
||||
t.add(r5 >ZERO ? "D" : "C", 5);
|
||||
|
||||
@ -1480,7 +1482,14 @@ void Visliq_app::recalc_next_liq(int start_month, TSheet_field* sl, TSheet_field
|
||||
}
|
||||
else
|
||||
t.add("", 10);
|
||||
t.add(_lim->get("S3"), 11);
|
||||
|
||||
real r0 = _lim->get_real("R0");
|
||||
|
||||
if (compensabile)
|
||||
r0 += autf24;
|
||||
t.add(abs(r0).string(), 11);
|
||||
t.add(r0 == ZERO ? "" : (r0 > ZERO ? "D" : "C"), 12);
|
||||
t.add(_lim->get("S3"), 13);
|
||||
|
||||
for (int kk = 3; kk < 6 ; kk++)
|
||||
sl->enable_cell(row, kk);
|
||||
@ -1488,7 +1497,7 @@ void Visliq_app::recalc_next_liq(int start_month, TSheet_field* sl, TSheet_field
|
||||
sl->enable_cell(row, 8);
|
||||
sl->enable_cell(row, 9);
|
||||
sl->enable_cell(row, 9, enable_date);
|
||||
sl->enable_cell(row, 12);
|
||||
sl->enable_cell(row, 14);
|
||||
}
|
||||
}
|
||||
sl->force_update();
|
||||
@ -1600,17 +1609,21 @@ void Visliq_app::read_general(TMask& m)
|
||||
else
|
||||
tt = &(sh.row(row));
|
||||
|
||||
const real r0abs = abs(_lim->get_real("R0"));
|
||||
|
||||
const real iva_ven = _lam->get_real("R0"); // IVA acquisti
|
||||
const real iva_acq = _lam->get_real("R1"); // IVA vendite
|
||||
const real ris = iva_ven -iva_acq;
|
||||
|
||||
const real r1 = _lim->get_real("R1");
|
||||
const real r5abs = abs(_lim->get_real("R5"));
|
||||
|
||||
tt->add(itoname(i),0);
|
||||
tt->add(r0abs.string(),1);
|
||||
tt->add(abs(ris).string(),1);
|
||||
|
||||
int sr0 = (_lim->get_real("R0")).sign();
|
||||
int sr5 = (_lim->get_real("R5")).sign();
|
||||
const int sris = ris.sign();
|
||||
const int sr5 = (_lim->get_real("R5")).sign();
|
||||
|
||||
tt->add(sr0 == 0 ? "" : (sr0 > 0 ? "D" : "C"),2);
|
||||
tt->add(sris == 0 ? "" : (sris > 0 ? "D" : "C"),2);
|
||||
tt->add(r1.string(),3);
|
||||
tt->add(r5abs.string(),4);
|
||||
bool enable_date = !r1.is_zero();
|
||||
@ -1629,8 +1642,6 @@ void Visliq_app::read_general(TMask& m)
|
||||
sh.enable_cell(row, 9, enable_date);
|
||||
if (compensabile)
|
||||
{
|
||||
// if (cr_res > ZERO)
|
||||
// {
|
||||
cr_res += autf24;
|
||||
cr_res -= crf24;
|
||||
cr_res -= criva;
|
||||
@ -1647,9 +1658,15 @@ void Visliq_app::read_general(TMask& m)
|
||||
}
|
||||
else
|
||||
tt->add("", 10);
|
||||
tt->add(_lim->get("S3"), 11);
|
||||
|
||||
real r0 = _lim->get_real("R0");
|
||||
|
||||
if (compensabile)
|
||||
r0 += autf24;
|
||||
tt->add(abs(r0).string(), 11);
|
||||
tt->add(r0 == ZERO ? "" : (r0 > ZERO ? "D" : "C"), 12);
|
||||
tt->add(_lim->get("S3"), 13);
|
||||
sh.row(row) = (*tt);
|
||||
// sh.force_update(row);
|
||||
}
|
||||
sh.force_update();
|
||||
|
||||
@ -1708,7 +1725,7 @@ void Visliq_app::read_general(TMask& m)
|
||||
tt.add(versamenti[i-1].string(),5);// versamenti
|
||||
|
||||
sv.row(-1) = tt;
|
||||
if (i == 12)
|
||||
if (i == 11)
|
||||
sv.enable_cell(sv.items() - 1, -1, false);
|
||||
}
|
||||
|
||||
@ -1771,7 +1788,7 @@ void Visliq_app::write_general(TMask& m)
|
||||
// risolve menata del dettaglio si'/no
|
||||
if (lfrommask)
|
||||
{
|
||||
for (int i = 1; i <= 11; i++)
|
||||
for (int i = 1; i <= 13; i++)
|
||||
tt_ln.add(shm.get(101+i),i);
|
||||
}
|
||||
|
||||
@ -1806,7 +1823,7 @@ void Visliq_app::write_general(TMask& m)
|
||||
TString8 ncab (tt_vn.get(3));
|
||||
TString ocon (tt_vo.get(4));
|
||||
TString ncon (tt_vn.get(4));
|
||||
TString descr(tt_ln.get(11));
|
||||
TString descr(tt_ln.get(13));
|
||||
|
||||
if (odbcr == "C") orett = -orett;
|
||||
if (ndbcr == "C") nrett = -nrett;
|
||||
@ -1997,14 +2014,10 @@ void Visliq_app::write_general(TMask& m)
|
||||
if (compensabile)
|
||||
{
|
||||
const real criva(tt_ln.get(6));
|
||||
// if (cr_res > ZERO)
|
||||
// {
|
||||
cr_res += autf24;
|
||||
cr_res -= crf24;
|
||||
cr_res -= criva;
|
||||
// }
|
||||
// if (cr_res < ZERO)
|
||||
// cr_res = ZERO;
|
||||
|
||||
cr_res += autf24;
|
||||
cr_res -= crf24;
|
||||
cr_res -= criva;
|
||||
if (cr_res < ZERO)
|
||||
sh.set_back_and_fore_color(COLOR_LTYELLOW, COLOR_DKRED, row, 7);
|
||||
else
|
||||
@ -2039,23 +2052,31 @@ void Visliq_app::write_general(TMask& m)
|
||||
// Rimetti a posto righe sheet se serve
|
||||
if (was_lim)
|
||||
{
|
||||
int sr0 = (_lim->get_real("R0")).sign();
|
||||
int sr5 = (_lim->get_real("R5")).sign();
|
||||
|
||||
real r0abs = abs(_lim->get_real("R0"));
|
||||
real r5abs = abs(_lim->get_real("R5"));
|
||||
|
||||
tt_ln.add(r0abs.string(),1);
|
||||
tt_ln.add(sr0 == 0 ? "" : (sr0 > 0 ? "D" : "C"), 2);
|
||||
|
||||
const real iva_ven = _lam->get_real("R0"); // IVA acquisti
|
||||
const real iva_acq = _lam->get_real("R1"); // IVA vendite
|
||||
const real ris = iva_ven - iva_acq;
|
||||
|
||||
tt_ln.add(abs(ris).string(), 1);
|
||||
tt_ln.add(ris == 0 ? "" : (ris > 0 ? "D" : "C"), 2);
|
||||
|
||||
tt_ln.add((_lim->get_real("R1")).string(),3);
|
||||
tt_ln.add(r5abs.string(),4);
|
||||
|
||||
int sr5 = (_lim->get_real("R5")).sign();
|
||||
real r5abs = abs(_lim->get_real("R5"));
|
||||
|
||||
tt_ln.add(r5abs.string(),4);
|
||||
tt_ln.add(sr5 == 0 ? "" : (sr5 > 0 ? "D" : "C"),5);
|
||||
if ( cr_res < ZERO)
|
||||
tt_ln.add("",10);
|
||||
else
|
||||
tt_ln.add(cr_res.string(),10);
|
||||
}
|
||||
tt_ln.add(cr_res.string(), 10);
|
||||
|
||||
real r0 = _lim->get_real("R0");
|
||||
|
||||
tt_ln.add(abs(r0).string(), 11);
|
||||
tt_ln.add(r0 == ZERO ? "" : (r0 > ZERO ? "D" : "C"), 12);
|
||||
}
|
||||
_from_one = false;
|
||||
} // for mese liq. (riga sheet)
|
||||
|
||||
|
||||
@ -1,9 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<report name="cg5500a" page_split="1" lpi="6">
|
||||
<description>Stampa prospetto liquidazione</description>
|
||||
<font face="Courier New" size="8" />
|
||||
<font face="Courier New" size="7" />
|
||||
<section type="Head" pattern="1">
|
||||
<font face="Courier New" bold="1" size="8" />
|
||||
<field type="Testo" width="4" pattern="2" text="Data">
|
||||
<font italic="1" face="Courier New" bold="1" size="8" />
|
||||
</field>
|
||||
<field type="Stringa" align="center" width="175" height="2" pattern="1">
|
||||
<font face="Arial" bold="1" size="14" />
|
||||
<prescript description="H0.0 PRESCRIPT">"Stampa Prospetto Liquidazione "
|
||||
@ -11,9 +14,6 @@
|
||||
+
|
||||
#THIS !</prescript>
|
||||
</field>
|
||||
<field type="Testo" width="4" pattern="2" text="Data">
|
||||
<font italic="1" face="Courier New" bold="1" size="8" />
|
||||
</field>
|
||||
<field x="5" type="Data" width="11" pattern="2">
|
||||
<source>#SYSTEM.DATE</source>
|
||||
</field>
|
||||
@ -37,52 +37,65 @@ GET_FIRM_DATA </prescript>
|
||||
<prescript description="H0.0 PRESCRIPT">"!IVA"
|
||||
GET_FIRM_DATA</prescript>
|
||||
</field>
|
||||
<field x="111.5" y="3.5" type="Testo" width="25" pattern="1" text="Credito anno precedente" />
|
||||
<field border="1" y="5" type="Testo" valign="center" align="center" width="13" height="2" pattern="1" text="Mese" />
|
||||
<field border="1" x="13" y="5" type="Testo" valign="center" align="center" width="22" height="2" pattern="1" text="Risultato" />
|
||||
<field border="1" x="35" y="5" type="Testo" valign="center" align="center" width="18" height="2" pattern="1" text="Rimborsi" />
|
||||
<field border="1" x="53" y="5" type="Testo" valign="center" align="center" width="22" height="2" pattern="1" text="Rettifiche" />
|
||||
<field border="1" x="75" y="5" type="Testo" valign="center" align="center" width="18" height="2" pattern="1" text="Credito utilizz. IVA" />
|
||||
<field border="1" x="93" y="5" type="Testo" valign="center" align="center" width="18" height="2" pattern="1" text="Credito utilizz. F24 " />
|
||||
<field border="1" x="111" y="5" type="Testo" valign="center" align="center" width="17" height="2" pattern="1" text="Credito autorizzato" />
|
||||
<field border="1" x="128" y="5" type="Testo" valign="center" align="center" width="12" height="2" pattern="1" text="Data Autorizz." />
|
||||
<field border="1" x="140" y="5" type="Testo" valign="center" align="center" width="18" height="2" pattern="1" text="Credito residuo" />
|
||||
<field border="1" x="158" y="5" type="Testo" valign="center" align="center" width="17" height="2" pattern="1" text="Descrizione" />
|
||||
<field x="48" y="3.5" type="Valuta" hidden="1" align="right" width="18" id="108" pattern="1" text="#########,@@">
|
||||
<field x="112" y="3.5" type="Testo" width="28" pattern="1" text="Credito anno precedente" />
|
||||
<field border="1" x="0.5" y="5" type="Testo" valign="center" align="center" width="13" height="2" pattern="1" text="Mese" />
|
||||
<field border="1" x="13.5" y="5" type="Testo" valign="center" align="center" width="19" height="2" pattern="1" text="Risultato" />
|
||||
<field border="1" x="32.5" y="5" type="Testo" valign="center" align="center" width="18" height="2" pattern="1" text="Rimborsi" />
|
||||
<field border="1" x="50.5" y="5" type="Testo" valign="center" align="center" width="19" height="2" pattern="1" text="Rettifiche" />
|
||||
<field border="1" x="69.5" y="5" type="Testo" valign="center" align="center" width="18" height="2" pattern="1" text="Credito utilizz. IVA" />
|
||||
<field border="1" x="87.5" y="5" type="Testo" valign="center" align="center" width="18" height="2" pattern="1" text="Credito utilizz. F24 " />
|
||||
<field border="1" x="105.5" y="5" type="Testo" valign="center" align="center" width="18" height="2" pattern="1" text="IVA dovuta o a credito" />
|
||||
<field border="1" x="123.5" y="5" type="Testo" valign="center" align="center" width="17" height="2" pattern="1" text="Credito autorizzato" />
|
||||
<field border="1" x="140.5" y="5" type="Testo" valign="center" align="center" width="12" height="2" pattern="1" text="Data Autorizz." />
|
||||
<field border="1" x="152.5" y="5" type="Testo" valign="center" align="center" width="18" height="2" pattern="1" text="Credito residuo" />
|
||||
<field border="1" x="170.5" y="5" type="Testo" valign="center" align="center" width="25" height="2" pattern="1" text="Descrizione" />
|
||||
<field x="48.5" y="3.5" type="Valuta" hidden="1" align="right" width="18" id="108" pattern="1" text="#########,@@">
|
||||
<prescript description="H0.108 PRESCRIPT">"R0"
|
||||
#FILTER @
|
||||
"%LIA"
|
||||
TABLE_READ</prescript>
|
||||
</field>
|
||||
<field x="78" y="3.5" type="Valuta" hidden="1" align="right" width="18" id="109" pattern="1" text="#########,@@">
|
||||
<field x="78.5" y="3.5" type="Valuta" hidden="1" align="right" width="18" id="109" pattern="1" text="#########,@@">
|
||||
<prescript description="H0.109 PRESCRIPT">"R15"
|
||||
#FILTER @
|
||||
"%LIA"
|
||||
TABLE_READ</prescript>
|
||||
</field>
|
||||
<field x="139.5" y="3.5" type="Valuta" align="right" width="18" id="110" pattern="1" text="###.###.###,@@">
|
||||
<field x="140" y="3.5" type="Valuta" align="right" width="18" id="110" pattern="1" text="###.###.###,@@">
|
||||
<font face="Courier New" size="8" />
|
||||
<prescript description="H0.110 PRESCRIPT">#108 @
|
||||
#109 @
|
||||
-
|
||||
#THIS !</prescript>
|
||||
</field>
|
||||
<field x="160" y="3.5" type="Array" width="30" id="111" pattern="1">
|
||||
<prescript description="H0.111 PRESCRIPT">"S9"
|
||||
#FILTER @
|
||||
"%LIA"
|
||||
TABLE_READ
|
||||
</prescript>
|
||||
<list>
|
||||
<li Value="Compensabile solo in IVA" Code=" " />
|
||||
<li Value="Compensabile in F24" Code="CM" />
|
||||
</list>
|
||||
</field>
|
||||
</section>
|
||||
<section type="Head" level="1" pattern="1" />
|
||||
<section type="Body" pattern="1" />
|
||||
<section type="Body" level="1" pattern="1">
|
||||
<field border="2" type="Linea" pattern="1" />
|
||||
<field border="2" x="13" type="Linea" pattern="1" />
|
||||
<field border="2" x="35" type="Linea" pattern="1" />
|
||||
<field border="2" x="53" type="Linea" pattern="1" />
|
||||
<field border="2" x="75" type="Linea" pattern="1" />
|
||||
<field border="2" x="93" type="Linea" pattern="1" />
|
||||
<field border="2" x="111" type="Linea" pattern="1" />
|
||||
<field border="2" x="128" type="Linea" pattern="1" />
|
||||
<field border="2" x="140" type="Linea" pattern="1" />
|
||||
<field border="2" x="158" type="Linea" pattern="1" />
|
||||
<field border="2" x="175" type="Linea" pattern="1" />
|
||||
<field type="Array" width="13" id="109" pattern="1">
|
||||
<field border="2" x="0.5" type="Linea" pattern="1" />
|
||||
<field border="2" x="13.5" type="Linea" pattern="1" />
|
||||
<field border="2" x="32.5" type="Linea" pattern="1" />
|
||||
<field border="2" x="50.5" type="Linea" pattern="1" />
|
||||
<field border="2" x="69.5" type="Linea" pattern="1" />
|
||||
<field border="2" x="87.5" type="Linea" pattern="1" />
|
||||
<field border="2" x="105.5" type="Linea" pattern="1" />
|
||||
<field border="2" x="123.5" type="Linea" pattern="1" />
|
||||
<field border="2" x="140.5" type="Linea" pattern="1" />
|
||||
<field border="2" x="152.5" type="Linea" pattern="1" />
|
||||
<field border="2" x="170.5" type="Linea" pattern="1" />
|
||||
<field border="2" x="195.5" type="Linea" pattern="1" />
|
||||
<field x="0.5" type="Array" width="13" id="109" pattern="1">
|
||||
<source>CODTAB[5,7]</source>
|
||||
<list>
|
||||
<li Value="Gennaio" Code="01" />
|
||||
@ -100,67 +113,118 @@ TABLE_READ</prescript>
|
||||
<li Value="Annuale" Code="13" />
|
||||
</list>
|
||||
</field>
|
||||
<field x="14" type="Valuta" align="right" width="18" id="110" pattern="1" text="###.###.###,@@">
|
||||
<source>R0</source>
|
||||
<prescript description="B1.110 PRESCRIPT">#THIS @
|
||||
<field x="13.5" type="Valuta" align="right" width="18" id="110" pattern="1" text="###.###.###,@@">
|
||||
<prescript description="B1.110 PRESCRIPT">"201@.R0" @
|
||||
"201@.R1" @
|
||||
-
|
||||
#THIS !
|
||||
#THIS @
|
||||
0
|
||||
E;
|
||||
IF
|
||||
"D"
|
||||
#201 !
|
||||
ELSE
|
||||
#THIS @
|
||||
0 C;
|
||||
IF
|
||||
0
|
||||
#THIS @
|
||||
-
|
||||
#THIS !
|
||||
"C"
|
||||
#201 !
|
||||
THEN
|
||||
#201 !</prescript>
|
||||
THEN</prescript>
|
||||
</field>
|
||||
<field x="35" type="Valuta" align="right" width="18" id="111" pattern="1" text="###.###.###,@@">
|
||||
<field x="32.5" type="Valuta" align="right" width="18" id="111" pattern="1" text="###.###.###,@@">
|
||||
<source>R1</source>
|
||||
</field>
|
||||
<field x="54" type="Valuta" align="right" width="18" id="112" pattern="1" text="###.###.###,@@">
|
||||
<field x="50.5" type="Valuta" align="right" width="18" id="112" pattern="1" text="###.###.###,@@">
|
||||
<source>R5</source>
|
||||
<prescript description="B1.112 PRESCRIPT">#THIS @
|
||||
0
|
||||
E;
|
||||
IF
|
||||
"D"
|
||||
#202 !
|
||||
ELSE
|
||||
#THIS @
|
||||
0 C;
|
||||
IF
|
||||
0
|
||||
#THIS @
|
||||
-
|
||||
#THIS !
|
||||
"C"
|
||||
#202 !
|
||||
THEN
|
||||
#202 !</prescript>
|
||||
THEN</prescript>
|
||||
</field>
|
||||
<field x="75" type="Valuta" align="right" width="18" id="113" pattern="1" text="###.###.###,@@">
|
||||
<field x="69.5" type="Valuta" align="right" width="18" id="113" pattern="1" text="###.###.###,@@">
|
||||
<source>R15</source>
|
||||
</field>
|
||||
<field x="93" type="Valuta" align="right" width="18" id="114" pattern="1" text="###.###.###,@@">
|
||||
<field x="87.5" type="Valuta" align="right" width="18" id="114" pattern="1" text="###.###.###,@@">
|
||||
<source>R16</source>
|
||||
</field>
|
||||
<field x="111" type="Valuta" align="right" width="17" id="115" pattern="1" text="###.###.###,@@">
|
||||
<field x="123.5" type="Valuta" align="right" width="17" id="115" pattern="1" text="###.###.###,@@">
|
||||
<source>R20</source>
|
||||
</field>
|
||||
<field x="128" type="Data" align="center" width="12" id="116" pattern="1">
|
||||
<field x="140.5" type="Data" align="center" width="12" id="116" pattern="1">
|
||||
<source>D1</source>
|
||||
</field>
|
||||
<field x="140" type="Valuta" align="right" width="18" id="117" pattern="1" text="###.###.###,@@">
|
||||
<field x="152.5" type="Valuta" align="right" width="18" id="117" pattern="1" text="###.###.###,@@">
|
||||
<prescript description="B1.117 PRESCRIPT">#H0.110 @
|
||||
#H0.111 @
|
||||
"CM"
|
||||
=
|
||||
IF
|
||||
#113 @ -
|
||||
#114 @ -
|
||||
#115 @ +
|
||||
ELSE
|
||||
#119 @
|
||||
0
|
||||
C;
|
||||
IF
|
||||
0
|
||||
#119 @
|
||||
-
|
||||
ELSE
|
||||
0
|
||||
THEN
|
||||
THEN
|
||||
DUP
|
||||
#THIS !
|
||||
#H0.110 !</prescript>
|
||||
</field>
|
||||
<field x="158" type="Stringa" dynamic_height="1" width="17" height="3" id="118" pattern="1">
|
||||
<field x="171" type="Stringa" dynamic_height="1" width="25" height="3" id="118" pattern="1">
|
||||
<source>S3</source>
|
||||
</field>
|
||||
<field x="33" type="Stringa" width="1" id="201" pattern="1" />
|
||||
<field x="73" type="Stringa" width="1" id="202" pattern="1" />
|
||||
<field x="105.5" type="Valuta" align="right" width="17" id="119" pattern="1" text="###.###.###,@@">
|
||||
<source>R0</source>
|
||||
<prescript description="B1.119 PRESCRIPT">#THIS @
|
||||
0
|
||||
E;
|
||||
IF
|
||||
"D"
|
||||
#203 !
|
||||
ELSE
|
||||
#THIS @
|
||||
0 C;
|
||||
IF
|
||||
0
|
||||
#THIS @
|
||||
-
|
||||
#THIS !
|
||||
"C"
|
||||
#203 !
|
||||
THEN
|
||||
THEN</prescript>
|
||||
</field>
|
||||
<field x="31.5" type="Stringa" width="1" id="201" pattern="1" />
|
||||
<field x="68.5" type="Stringa" width="1" id="202" pattern="1" />
|
||||
<field x="122.5" type="Stringa" width="1" id="203" pattern="1" />
|
||||
</section>
|
||||
<section hidden_if_needed="1" type="Foot" pattern="1">
|
||||
<field border="2" type="Linea" pattern="1" />
|
||||
@ -178,20 +242,22 @@ DUP
|
||||
</section>
|
||||
<section type="Foot" level="1" pattern="1">
|
||||
<font face="Courier New" bold="1" size="10" />
|
||||
<field border="2" type="Linea" pattern="1" />
|
||||
<field border="2" x="13" type="Linea" pattern="1" />
|
||||
<field border="2" x="35" type="Linea" pattern="1" />
|
||||
<field border="2" x="53" type="Linea" pattern="1" />
|
||||
<field border="2" x="75" type="Linea" pattern="1" />
|
||||
<field border="2" x="93" type="Linea" pattern="1" />
|
||||
<field border="2" x="111" type="Linea" pattern="1" />
|
||||
<field border="2" x="128" type="Linea" pattern="1" />
|
||||
<field border="2" x="140" type="Linea" pattern="1" />
|
||||
<field border="2" x="158" type="Linea" pattern="1" />
|
||||
<field border="2" x="175" type="Linea" pattern="1" />
|
||||
<field border="2" y="1" type="Linea" width="175" height="0" pattern="1" />
|
||||
<field border="2" x="0.5" type="Linea" pattern="1" />
|
||||
<field border="2" x="13.5" type="Linea" pattern="1" />
|
||||
<field border="2" x="32.5" type="Linea" pattern="1" />
|
||||
<field border="2" x="50.5" type="Linea" pattern="1" />
|
||||
<field border="2" x="69.5" type="Linea" pattern="1" />
|
||||
<field border="2" x="87.5" type="Linea" pattern="1" />
|
||||
<field border="2" x="105.5" type="Linea" pattern="1" />
|
||||
<field border="2" x="123.5" type="Linea" pattern="1" />
|
||||
<field border="2" x="140.5" type="Linea" pattern="1" />
|
||||
<field border="2" x="152.5" type="Linea" pattern="1" />
|
||||
<field border="2" x="170.5" type="Linea" pattern="1" />
|
||||
<field border="2" x="195.5" type="Linea" pattern="1" />
|
||||
<field border="2" x="0.5" y="1" type="Linea" width="195" height="0" pattern="1" />
|
||||
</section>
|
||||
<sql>USE LIM
|
||||
JOIN LAM ALIAS 201 INTO CODTAB==CODTAB
|
||||
FROM CODTAB=#ANNO
|
||||
TO CODTAB=#ANNO</sql>
|
||||
</report>
|
||||
@ -73,6 +73,8 @@ BEGIN
|
||||
ITEM "Credito anno in corso\nautorizzato F24@20"
|
||||
ITEM "Data autorizzazione@20"
|
||||
ITEM "Credito IVA\nresiduo@15"
|
||||
ITEM "IVA dovuta o\na credito@15"
|
||||
ITEM "D/C@3"
|
||||
ITEM "Descrizione@50"
|
||||
END
|
||||
|
||||
@ -201,9 +203,26 @@ BEGIN
|
||||
GROUP 12
|
||||
END
|
||||
|
||||
STRING 112 50 35
|
||||
CURRENCY 112 15
|
||||
BEGIN
|
||||
PROMPT 1 10 "Descr. "
|
||||
PROMPT 1 10 "IVA dovuta o credito "
|
||||
FLAGS "D"
|
||||
GROUP 12
|
||||
END
|
||||
|
||||
LIST 113 1 10
|
||||
BEGIN
|
||||
PROMPT 57 10 ""
|
||||
ITEM " | "
|
||||
ITEM "D|Debito"
|
||||
ITEM "C|Credito"
|
||||
FLAGS "UD"
|
||||
GROUP 11
|
||||
END
|
||||
|
||||
STRING 114 50 35
|
||||
BEGIN
|
||||
PROMPT 1 11 "Descr. "
|
||||
GROUP 12
|
||||
FLAGS "D"
|
||||
END
|
||||
|
||||
@ -251,7 +251,7 @@ END
|
||||
|
||||
CURRENCY F_CREDAUT 15
|
||||
BEGIN
|
||||
PROMPT 2 22 "Credito IVA autorizzato in F24 : "
|
||||
PROMPT 2 21 "Credito IVA autorizzato in F24 :"
|
||||
GROUP 10
|
||||
FLAGS "H"
|
||||
PICTURE "."
|
||||
|
||||
@ -700,7 +700,7 @@ bool TSaldo::saldo_cont_sep(int g, int c, long s, const int codes, TDate al,
|
||||
|
||||
if (ok)
|
||||
{
|
||||
if (mov.get(MOV_CONTSEP) == cont_sep)
|
||||
if (( cont_sep != NULL && *cont_sep == '\0') || mov.get(MOV_CONTSEP) == cont_sep)
|
||||
{
|
||||
_codcaus = mov.get(MOV_CODCAUS);
|
||||
_datareg = mov.get(MOV_DATAREG);
|
||||
|
||||
@ -4,7 +4,8 @@ Picture = <cg01>
|
||||
Module = 2
|
||||
Flags = ""
|
||||
Item_01 = "Tabelle ditta", [NPMENU_002]
|
||||
Item_01 = "Stampe", [NPMENU_003]
|
||||
Item_02 = "Stampe", [NPMENU_003]
|
||||
Item_03 = "Apertura/Chiusura", "np0 -1", "F"
|
||||
|
||||
[NPMENU_002]
|
||||
Caption = "Tabelle ditta"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user