Merge branch 'R_10_00' of http://10.65.20.33/sirio/CAMPO/campo into R_10_00
This commit is contained in:
Simone Palacino
commit
8dfc4b9a9f
@ -211,6 +211,7 @@
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cglib03.cpp" />
|
||||
<ClCompile Include="..\src\cg\cglib05.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
</ExcludedFromBuild>
|
||||
@ -221,6 +222,7 @@
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cgsaldac.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<MskCompiler Include="..\src\cg\cg0100a.uml" />
|
||||
|
||||
@ -75,6 +75,12 @@
|
||||
<ClCompile Include="..\src\ba\ba8500.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cglib03.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cgsaldac.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<MskCompiler Include="..\src\cg\cg0100a.uml">
|
||||
|
||||
@ -318,6 +318,7 @@
|
||||
<ClInclude Include="..\src\cg\cg1500.h" />
|
||||
<ClInclude Include="..\src\cg\cg1600.h" />
|
||||
<ClInclude Include="..\src\cg\cg1700.h" />
|
||||
<ClInclude Include="..\src\cg\cglib.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<CustomBuildStep Include="..\lib\AgaLib.lib">
|
||||
|
||||
@ -214,6 +214,9 @@
|
||||
<ClInclude Include="..\src\cg\cg1300n.h">
|
||||
<Filter>Header</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\src\cg\cglib.h">
|
||||
<Filter>Header</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="campo.rc" />
|
||||
|
||||
@ -168,24 +168,12 @@
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cg2101.cpp">
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cg2102.cpp">
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cg2103.cpp">
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cg2104.cpp">
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
@ -230,6 +218,7 @@
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cglib03.cpp" />
|
||||
<ClCompile Include="..\src\cg\cglib06.cpp" />
|
||||
<ClCompile Include="..\src\cg\cgpagame.cpp">
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
@ -284,7 +273,6 @@
|
||||
<ClInclude Include="..\src\cg\cg2100p.h" />
|
||||
<ClInclude Include="..\src\cg\cg2101.h" />
|
||||
<ClInclude Include="..\src\cg\cg2102.h" />
|
||||
<ClInclude Include="..\src\cg\cg2103.h" />
|
||||
<ClInclude Include="..\src\cg\cg2104a.h" />
|
||||
<ClInclude Include="..\src\cg\cg2105.h" />
|
||||
<ClInclude Include="..\src\cg\cg2107.h" />
|
||||
@ -292,8 +280,7 @@
|
||||
<ClInclude Include="..\src\cg\cg2200.h" />
|
||||
<ClInclude Include="..\src\cg\cg2300a.h" />
|
||||
<ClInclude Include="..\src\cg\cgFPPRO.h" />
|
||||
<ClInclude Include="..\src\cg\cglib01.h" />
|
||||
<ClInclude Include="..\src\cg\cglib02.h" />
|
||||
<ClInclude Include="..\src\cg\cglib.h" />
|
||||
<ClInclude Include="..\src\cg\cgsalda3.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
@ -321,6 +308,15 @@
|
||||
<ProjectReference Include="fplib.vcxproj">
|
||||
<Project>{c575788b-0be4-4f68-b9c9-3c204ec04e07}</Project>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="lilib.vcxproj">
|
||||
<Project>{b61f0ad4-0cce-4371-8e92-85a26caf1a7c}</Project>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="vedoc.vcxproj">
|
||||
<Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="vedocext.vcxproj">
|
||||
<Project>{0042619a-6b7c-4d3d-9cd9-9bdd8d200c15}</Project>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
|
||||
@ -27,15 +27,9 @@
|
||||
<ClCompile Include="..\src\cg\cg2100.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cg2101.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cg2102.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cg2103.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cg2104.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
@ -75,6 +69,9 @@
|
||||
<ClCompile Include="..\src\cg\cg2300.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cglib06.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<MskCompiler Include="..\src\cg\cg2100a.uml">
|
||||
@ -148,9 +145,6 @@
|
||||
<ClInclude Include="..\src\cg\cg2102.h">
|
||||
<Filter>Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\src\cg\cg2103.h">
|
||||
<Filter>Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\src\cg\cg2104a.h">
|
||||
<Filter>Headers</Filter>
|
||||
</ClInclude>
|
||||
@ -172,18 +166,15 @@
|
||||
<ClInclude Include="..\src\cg\cg2105.h">
|
||||
<Filter>Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\src\cg\cglib01.h">
|
||||
<Filter>Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\src\cg\cglib02.h">
|
||||
<Filter>Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\src\cg\cgFPPRO.h">
|
||||
<Filter>Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\src\cg\cg2300a.h">
|
||||
<Filter>Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\src\cg\cglib.h">
|
||||
<Filter>Headers</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="campo.rc" />
|
||||
|
||||
@ -68,7 +68,6 @@
|
||||
<PreprocessorDefinitions>_DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;__LONGDOUBLE__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>false</MinimalRebuild>
|
||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
||||
@ -157,7 +156,6 @@
|
||||
</PostBuildEvent>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\src\cg\cg2103.cpp" />
|
||||
<ClCompile Include="..\src\cg\cg3.cpp">
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
|
||||
@ -22,9 +22,6 @@
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\src\cg\cg2103.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cg3.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
|
||||
@ -157,18 +157,6 @@
|
||||
</Xdcmake>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\src\cg\cg2101.cpp">
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cg2103.cpp">
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cg4.cpp">
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
|
||||
@ -18,9 +18,6 @@
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\src\cg\cg2101.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cg4.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
@ -81,7 +78,6 @@
|
||||
<ClCompile Include="..\src\cg\cgsaldac.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cg2103.cpp" />
|
||||
<ClCompile Include="..\src\cg\cg4800.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
|
||||
@ -72,7 +72,6 @@
|
||||
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
|
||||
<ObjectFileName>$(IntDir)</ObjectFileName>
|
||||
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
||||
@ -162,7 +161,6 @@
|
||||
</PostBuildEvent>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\src\cg\cg2103.cpp" />
|
||||
<ClCompile Include="..\src\cg\cg5.cpp">
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
@ -248,6 +246,7 @@
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cgsaldac.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<MskCompiler Include="..\src\cg\cg5000a.uml" />
|
||||
|
||||
@ -23,9 +23,6 @@
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\src\cg\cg2103.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cg5.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
@ -71,6 +68,9 @@
|
||||
<ClCompile Include="..\src\cg\cg5900.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cgsaldac.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<MskCompiler Include="..\src\cg\cg5000a.uml">
|
||||
|
||||
@ -68,7 +68,6 @@
|
||||
<PreprocessorDefinitions>_DEBUG;WIN32;__LONGDOUBLE__;DBG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>false</MinimalRebuild>
|
||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
||||
@ -161,7 +160,6 @@
|
||||
</PostBuildEvent>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\src\cg\cg2103.cpp" />
|
||||
<ClCompile Include="..\src\cg\cg6.cpp">
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
|
||||
@ -19,9 +19,6 @@
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\src\cg\cg2103.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cg6.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
|
||||
@ -161,7 +161,6 @@
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\src\ba\ba8500.cpp" />
|
||||
<ClCompile Include="..\src\cg\cg2103.cpp" />
|
||||
<ClCompile Include="..\src\cg\cg7.cpp">
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
@ -182,7 +181,9 @@
|
||||
<ClCompile Include="..\src\cg\cg7700.cpp" />
|
||||
<ClCompile Include="..\src\cg\cg7800.cpp" />
|
||||
<ClCompile Include="..\src\cg\cglib01.cpp" />
|
||||
<ClCompile Include="..\src\cg\cglib03.cpp" />
|
||||
<ClCompile Include="..\src\cg\cgpim.cpp" />
|
||||
<ClCompile Include="..\src\cg\cgsaldac.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\src\cg\cg2103.h" />
|
||||
|
||||
@ -37,9 +37,8 @@
|
||||
<ClCompile Include="..\src\cg\cg7800.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cg2103.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cglib03.cpp" />
|
||||
<ClCompile Include="..\src\cg\cgsaldac.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\src\cg\cg7.h">
|
||||
|
||||
15
build/ce.sln
15
build/ce.sln
@ -1,6 +1,8 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 11.00
|
||||
# Visual Studio 2010
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.28307.1169
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ce0", "ce0.vcxproj", "{DAEFA33C-8BF7-4346-8BCC-D7229F0E1BA2}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ce1", "ce1.vcxproj", "{A065CAF1-2469-43E2-BCBD-8410B0EBCF98}"
|
||||
@ -17,6 +19,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc", "vedoc.vcxproj", "{
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedocext", "vedocext.vcxproj", "{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lilib", "lilib.vcxproj", "{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Win32 = Debug|Win32
|
||||
@ -55,8 +59,15 @@ Global
|
||||
{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.Build.0 = Release|Win32
|
||||
{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Release|Win32.Build.0 = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {4C2A1F08-ED05-4409-B36D-EB708DD51953}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
||||
@ -200,6 +200,8 @@
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cglib03.cpp" />
|
||||
<ClCompile Include="..\src\cg\cgsaldac.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<MskCompiler Include="..\src\ce\ce0400a.uml" />
|
||||
|
||||
@ -68,6 +68,12 @@
|
||||
<ClCompile Include="..\src\cg\cglib01.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cglib03.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cgsaldac.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<MskCompiler Include="..\src\ce\ce0400a.uml">
|
||||
|
||||
@ -211,22 +211,8 @@
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<MskCompiler Include="..\src\ce\ce1101a.uml" />
|
||||
<MskCompiler Include="..\src\ce\ce1101b.uml" />
|
||||
<MskCompiler Include="..\src\ce\ce1201a.uml" />
|
||||
<MskCompiler Include="..\src\ce\ce1201b.uml" />
|
||||
<MskCompiler Include="..\src\ce\ce1301a.uml" />
|
||||
<MskCompiler Include="..\src\ce\ce1301b.uml" />
|
||||
<MskCompiler Include="..\src\ce\ce1301c.uml" />
|
||||
<MskCompiler Include="..\src\ce\ce1301d.uml" />
|
||||
<MskCompiler Include="..\src\ce\ce1400a.uml" />
|
||||
<MskCompiler Include="..\src\ce\ce1400b.uml" />
|
||||
<MskCompiler Include="..\src\ce\ce1400c.uml" />
|
||||
<MskCompiler Include="..\src\ce\ce1400d.uml" />
|
||||
<MskCompiler Include="..\src\ce\ce1500a.uml" />
|
||||
<MskCompiler Include="..\src\ce\ce1500b.uml" />
|
||||
<ClCompile Include="..\src\cg\cglib03.cpp" />
|
||||
<ClCompile Include="..\src\cg\cgsaldac.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\src\ce\ce1.h" />
|
||||
@ -256,6 +242,22 @@
|
||||
<Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<MskCompiler Include="..\src\ce\ce1101a.uml" />
|
||||
<MskCompiler Include="..\src\ce\ce1101b.uml" />
|
||||
<MskCompiler Include="..\src\ce\ce1201a.uml" />
|
||||
<MskCompiler Include="..\src\ce\ce1201b.uml" />
|
||||
<MskCompiler Include="..\src\ce\ce1301a.uml" />
|
||||
<MskCompiler Include="..\src\ce\ce1301b.uml" />
|
||||
<MskCompiler Include="..\src\ce\ce1301c.uml" />
|
||||
<MskCompiler Include="..\src\ce\ce1301d.uml" />
|
||||
<MskCompiler Include="..\src\ce\ce1400a.uml" />
|
||||
<MskCompiler Include="..\src\ce\ce1400b.uml" />
|
||||
<MskCompiler Include="..\src\ce\ce1400c.uml" />
|
||||
<MskCompiler Include="..\src\ce\ce1400d.uml" />
|
||||
<MskCompiler Include="..\src\ce\ce1500a.uml" />
|
||||
<MskCompiler Include="..\src\ce\ce1500b.uml" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
<Import Project="CampoRules.targets" />
|
||||
|
||||
@ -5,14 +5,13 @@
|
||||
<UniqueIdentifier>{7c3a9064-9294-4c3a-8baa-300e10afb005}</UniqueIdentifier>
|
||||
<Extensions>cpp</Extensions>
|
||||
</Filter>
|
||||
<Filter Include="Masks">
|
||||
<UniqueIdentifier>{03b2674b-dbfb-4f99-b837-50e8d4b93eb5}</UniqueIdentifier>
|
||||
<Extensions>uml</Extensions>
|
||||
</Filter>
|
||||
<Filter Include="Headers">
|
||||
<UniqueIdentifier>{0fc89884-3691-4ec3-92cc-3bf0a1cdb4d9}</UniqueIdentifier>
|
||||
<Extensions>h</Extensions>
|
||||
</Filter>
|
||||
<Filter Include="Masks">
|
||||
<UniqueIdentifier>{800a751f-a084-4691-9d1a-972ced8a450c}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\src\ce\ce1.cpp">
|
||||
@ -42,6 +41,41 @@
|
||||
<ClCompile Include="..\src\cg\cglib01.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cglib03.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cgsaldac.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\src\ce\ce1.h">
|
||||
<Filter>Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\src\ce\ce1101a.h">
|
||||
<Filter>Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\src\ce\ce1101b.h">
|
||||
<Filter>Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\src\ce\ce1201a.h">
|
||||
<Filter>Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\src\ce\ce1201b.h">
|
||||
<Filter>Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\src\ce\ce1301a.h">
|
||||
<Filter>Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\src\ce\ce1400a.h">
|
||||
<Filter>Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\src\ce\ce1500a.h">
|
||||
<Filter>Headers</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="campo.rc" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<MskCompiler Include="..\src\ce\ce1101a.uml">
|
||||
@ -87,33 +121,4 @@
|
||||
<Filter>Masks</Filter>
|
||||
</MskCompiler>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\src\ce\ce1.h">
|
||||
<Filter>Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\src\ce\ce1101a.h">
|
||||
<Filter>Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\src\ce\ce1101b.h">
|
||||
<Filter>Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\src\ce\ce1201a.h">
|
||||
<Filter>Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\src\ce\ce1201b.h">
|
||||
<Filter>Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\src\ce\ce1301a.h">
|
||||
<Filter>Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\src\ce\ce1400a.h">
|
||||
<Filter>Headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\src\ce\ce1500a.h">
|
||||
<Filter>Headers</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="campo.rc" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
@ -209,6 +209,8 @@
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cglib03.cpp" />
|
||||
<ClCompile Include="..\src\cg\cgsaldac.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<MskCompiler Include="..\src\ce\ce2100a.uml" />
|
||||
|
||||
@ -42,6 +42,12 @@
|
||||
<ClCompile Include="..\src\cg\cglib01.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cglib03.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cgsaldac.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<MskCompiler Include="..\src\ce\ce2100a.uml">
|
||||
|
||||
@ -145,6 +145,7 @@
|
||||
<DataExecutionPrevention>
|
||||
</DataExecutionPrevention>
|
||||
<TargetMachine>MachineX86</TargetMachine>
|
||||
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
|
||||
</Link>
|
||||
<Bscmake>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
@ -233,6 +234,8 @@
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cglib03.cpp" />
|
||||
<ClCompile Include="..\src\cg\cgsaldac.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<MskCompiler Include="..\src\ce\ce3100a.uml" />
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
<UniqueIdentifier>{05506d07-793c-483a-8422-b5fb02dacf22}</UniqueIdentifier>
|
||||
<Extensions>frm</Extensions>
|
||||
</Filter>
|
||||
<Filter Include="Reports">
|
||||
<Filter Include="Masks\Reports">
|
||||
<UniqueIdentifier>{e6a64266-c231-455f-82d7-466e432409c5}</UniqueIdentifier>
|
||||
<Extensions>rep</Extensions>
|
||||
</Filter>
|
||||
@ -62,6 +62,12 @@
|
||||
<ClCompile Include="..\src\cg\cglib01.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cglib03.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cgsaldac.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<MskCompiler Include="..\src\ce\ce3100a.uml">
|
||||
@ -135,10 +141,10 @@
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<RepCompiler Include="..\src\ce\ce3900a.rep">
|
||||
<Filter>Reports</Filter>
|
||||
<Filter>Masks\Reports</Filter>
|
||||
</RepCompiler>
|
||||
<RepCompiler Include="..\src\ce\ce3900b.rep">
|
||||
<Filter>Reports</Filter>
|
||||
<Filter>Masks\Reports</Filter>
|
||||
</RepCompiler>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
||||
@ -190,21 +190,10 @@
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cg2101.cpp" />
|
||||
<ClCompile Include="..\src\cg\cglib01.cpp" />
|
||||
<ClCompile Include="..\src\cg\cglib02.cpp" />
|
||||
<ClCompile Include="..\src\cg\cglib03.cpp" />
|
||||
<ClCompile Include="..\src\ve\velib04.cpp">
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\ve\velib04a.cpp">
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cgsaldac.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<MskCompiler Include="..\src\ce\ce4100a.uml" />
|
||||
@ -282,6 +271,9 @@
|
||||
<LinkLibraryDependencies>true</LinkLibraryDependencies>
|
||||
<UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="lilib.vcxproj">
|
||||
<Project>{b61f0ad4-0cce-4371-8e92-85a26caf1a7c}</Project>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="vedoc.vcxproj">
|
||||
<Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
|
||||
</ProjectReference>
|
||||
|
||||
@ -26,9 +26,6 @@
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\src\ce\ce2101.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\ce\ce4.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
@ -50,19 +47,19 @@
|
||||
<ClCompile Include="..\src\ce\celib.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cg2101.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cglib02.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cglib03.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\ve\velib04.cpp">
|
||||
<ClCompile Include="..\src\cg\cglib01.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\ve\velib04a.cpp">
|
||||
<ClCompile Include="..\src\cg\cgsaldac.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\ce\ce2101.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
|
||||
18
build/cg.sln
18
build/cg.sln
@ -31,6 +31,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fplib", "fplib.vcxproj", "{
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "f1lib", "f1lib.vcxproj", "{41F4C25F-6BD2-4FC9-A0D3-A68CD1C9E4FC}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc", "vedoc.vcxproj", "{A1CE9743-A597-4F92-B55A-345A366C9E55}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lilib", "lilib.vcxproj", "{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedocext", "vedocext.vcxproj", "{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Win32 = Debug|Win32
|
||||
@ -85,6 +91,18 @@ Global
|
||||
{41F4C25F-6BD2-4FC9-A0D3-A68CD1C9E4FC}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{41F4C25F-6BD2-4FC9-A0D3-A68CD1C9E4FC}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{41F4C25F-6BD2-4FC9-A0D3-A68CD1C9E4FC}.Release|Win32.Build.0 = Release|Win32
|
||||
{A1CE9743-A597-4F92-B55A-345A366C9E55}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{A1CE9743-A597-4F92-B55A-345A366C9E55}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.Build.0 = Release|Win32
|
||||
{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Release|Win32.Build.0 = Release|Win32
|
||||
{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.Build.0 = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
||||
15
build/mg.sln
15
build/mg.sln
@ -1,6 +1,8 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 11.00
|
||||
# Visual Studio 2010
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.28307.1169
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mg0", "mg0.vcxproj", "{B184942F-568D-4B21-BD89-16908381BF8F}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mg1", "mg1.vcxproj", "{28F3586B-D475-4355-818D-8B1184179848}"
|
||||
@ -15,6 +17,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj",
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc", "vedoc.vcxproj", "{A1CE9743-A597-4F92-B55A-345A366C9E55}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lilib", "lilib.vcxproj", "{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Win32 = Debug|Win32
|
||||
@ -49,8 +53,15 @@ Global
|
||||
{A1CE9743-A597-4F92-B55A-345A366C9E55}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.Build.0 = Release|Win32
|
||||
{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Release|Win32.Build.0 = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {A592BC13-E70D-4FA8-9015-547C9535CF6F}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
||||
@ -94,6 +94,7 @@
|
||||
<TargetMachine>MachineX86</TargetMachine>
|
||||
<Version>12.0</Version>
|
||||
<ProfileGuidedDatabase>$(IntDir)</ProfileGuidedDatabase>
|
||||
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
|
||||
</Link>
|
||||
<Bscmake>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
@ -173,6 +174,8 @@
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cglib03.cpp" />
|
||||
<ClCompile Include="..\src\cg\cgsaldac.cpp" />
|
||||
<ClCompile Include="..\src\db\dblib.cpp">
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
|
||||
@ -62,6 +62,12 @@
|
||||
<ClCompile Include="..\src\mg\mg0200.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cgsaldac.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cglib03.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<MskCompiler Include="..\src\mg\mg0300a.uml">
|
||||
|
||||
@ -177,6 +177,7 @@
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cgsaldac.cpp" />
|
||||
<ClCompile Include="..\src\db\dblib.cpp">
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
|
||||
@ -54,6 +54,9 @@
|
||||
<ClCompile Include="..\src\mg\mg1300.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cgsaldac.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<MskCompiler Include="..\src\mg\mg1100.uml">
|
||||
|
||||
@ -144,6 +144,7 @@
|
||||
</DataExecutionPrevention>
|
||||
<TargetMachine>MachineX86</TargetMachine>
|
||||
<Version>12.0</Version>
|
||||
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
|
||||
</Link>
|
||||
<Bscmake>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
@ -173,6 +174,8 @@
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cglib03.cpp" />
|
||||
<ClCompile Include="..\src\cg\cgsaldac.cpp" />
|
||||
<ClCompile Include="..\src\db\dblib.cpp">
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
|
||||
@ -68,6 +68,12 @@
|
||||
<ClCompile Include="..\src\mg\mglib03.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cgsaldac.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cglib03.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<MskCompiler Include="..\src\mg\mg3100.uml">
|
||||
|
||||
@ -124,7 +124,6 @@
|
||||
<PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;__LONGDOUBLE__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>false</MinimalRebuild>
|
||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
||||
@ -153,6 +152,7 @@
|
||||
<Version>12.0</Version>
|
||||
<ProgramDatabaseFile>$(IntDir)</ProgramDatabaseFile>
|
||||
<ProfileGuidedDatabase>$(IntDir)</ProfileGuidedDatabase>
|
||||
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
|
||||
</Link>
|
||||
<Bscmake>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
@ -163,6 +163,13 @@
|
||||
</Xdcmake>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\src\cg\cglib01.cpp">
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cgsaldac.cpp" />
|
||||
<ClCompile Include="..\src\mg\mg4.cpp">
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
@ -250,6 +257,9 @@
|
||||
<ProjectReference Include="AgaLib.vcxproj">
|
||||
<Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="lilib.vcxproj">
|
||||
<Project>{b61f0ad4-0cce-4371-8e92-85a26caf1a7c}</Project>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="vedoc.vcxproj">
|
||||
<Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
|
||||
</ProjectReference>
|
||||
|
||||
@ -40,6 +40,12 @@
|
||||
<ClCompile Include="..\src\mg\mglib06.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cglib01.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cgsaldac.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<MskCompiler Include="..\src\mg\mg4100.uml">
|
||||
|
||||
@ -162,6 +162,7 @@
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cgsaldac.cpp" />
|
||||
<ClCompile Include="..\src\db\dblib.cpp">
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
|
||||
@ -69,6 +69,9 @@
|
||||
<ClCompile Include="..\src\ve\ve2800.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\cg\cgsaldac.cpp">
|
||||
<Filter>Sources</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\src\ve\ve2.h">
|
||||
|
||||
3
cd/test/bs0986.txt
Normal file
3
cd/test/bs0986.txt
Normal file
@ -0,0 +1,3 @@
|
||||
bs0.exe
|
||||
|
||||
Modifica per importazione sknet nuovabienne vecchi codici pack: lettura da db codice articolo interno giusto.
|
||||
21
cd/test/bs0986a.ini
Normal file
21
cd/test/bs0986a.ini
Normal file
@ -0,0 +1,21 @@
|
||||
[Main]
|
||||
Demo=0
|
||||
|
||||
[bs0]
|
||||
File(0) = bs0.exe|X
|
||||
Patch = 0986
|
||||
Versione = 21511200
|
||||
|
||||
[bs]
|
||||
Data = 30-07-2020
|
||||
Descrizione = Bee Store
|
||||
Dischi = 1
|
||||
Moduli = ve
|
||||
OEM =
|
||||
Patch = 986
|
||||
PostProcess =
|
||||
PreProcess =
|
||||
Prezzo(1) =
|
||||
Prezzo(2) =
|
||||
Versione = 21511200
|
||||
|
||||
BIN
cd/test/bs0986a1.zip
Normal file
BIN
cd/test/bs0986a1.zip
Normal file
Binary file not shown.
3
cd/test/cg0985.txt
Normal file
3
cd/test/cg0985.txt
Normal file
@ -0,0 +1,3 @@
|
||||
cg5200a.msk
|
||||
|
||||
Maschera visualizzazione saldi
|
||||
98
cd/test/cg0985a.ini
Normal file
98
cd/test/cg0985a.ini
Normal file
@ -0,0 +1,98 @@
|
||||
[Main]
|
||||
Demo=0
|
||||
|
||||
[cg5]
|
||||
File(110) = cg5200a.msk|X
|
||||
Patch = 985
|
||||
Versione = 21511200
|
||||
|
||||
[cg99]
|
||||
Kill(0) = batbpdb.msk|x
|
||||
Kill(1) = bastndo.rep|x
|
||||
Kill(2) = batbarb.msk|x
|
||||
Kill(3) = batbpor.msk|x
|
||||
Kill(4) = bastesc.msk|x
|
||||
Kill(5) = batbzon.msk|x
|
||||
Kill(6) = batblia.msk|x
|
||||
Kill(7) = batbver.msk|x
|
||||
Kill(8) = bastcco.rep|x
|
||||
Kill(9) = bastpdb.rep|x
|
||||
Kill(10) = bastesc.rep|x
|
||||
Kill(11) = bastivd.msk|x
|
||||
Kill(12) = bastcfi.msk|x
|
||||
Kill(13) = batbind.msk|x
|
||||
Kill(14) = bastarb.msk|x
|
||||
Kill(15) = bastdpn.rep|x
|
||||
Kill(16) = batbleg.msk|x
|
||||
Kill(17) = batbinl.msk|x
|
||||
Kill(18) = batbvet.msk|x
|
||||
Kill(19) = bastdpn.msk|x
|
||||
Kill(20) = bastcco.msk|x
|
||||
Kill(21) = batblbu.msk|x
|
||||
Kill(22) = bastreg.msk|x
|
||||
Kill(23) = batbdel.msk|x
|
||||
Kill(24) = bastmsp.rep|x
|
||||
Kill(25) = batbins.msk|x
|
||||
Kill(26) = bastnot.msk|x
|
||||
Kill(27) = batbntb.msk|x
|
||||
Kill(28) = bastleg.msk|x
|
||||
Kill(29) = bastndo.msk|x
|
||||
Kill(30) = bastnot.rep|x
|
||||
Kill(31) = bastcve.msk|x
|
||||
Kill(32) = cgtbcon.msk|x
|
||||
Kill(33) = bastcam.rep|x
|
||||
Kill(34) = batbreg.msk|x
|
||||
Kill(35) = batbivd.msk|x
|
||||
Kill(36) = bastpor.rep|x
|
||||
Kill(37) = bastvet.msk|x
|
||||
Kill(38) = bastpor.msk|x
|
||||
Kill(39) = bastver.rep|x
|
||||
Kill(40) = batblia.msk|x
|
||||
Kill(41) = batbmsp.msk|x
|
||||
Kill(42) = bastmsp.msk|x
|
||||
Kill(43) = bastcfi.rep|x
|
||||
Kill(44) = bastntb.rep|x
|
||||
Kill(45) = bastleg.rep|x
|
||||
Kill(46) = batbscc.msk|x
|
||||
Kill(47) = bastcve.rep|x
|
||||
Kill(48) = bastzon.rep|x
|
||||
Kill(49) = bastarb.rep|x
|
||||
Kill(50) = batbcam.msk|x
|
||||
Kill(51) = bastntb.msk|x
|
||||
Kill(52) = bastzon.msk|x
|
||||
Kill(53) = bastivd.rep|x
|
||||
Kill(54) = bastpdb.msk|x
|
||||
Kill(55) = batbcve.msk|x
|
||||
Kill(56) = batbesc.msk|x
|
||||
Kill(57) = bastscc.msk|x
|
||||
Kill(58) = batbtra.msk|x
|
||||
Kill(59) = bastvet.rep|x
|
||||
Kill(60) = batbcfi.msk|x
|
||||
Kill(61) = bastscc.rep|x
|
||||
Kill(62) = batbtit.msk|x
|
||||
Kill(63) = bastver.msk|x
|
||||
Kill(64) = bastcam.msk|x
|
||||
Kill(65) = bastreg.rep|x
|
||||
Kill(66) = cg2fppro.msk|x
|
||||
Kill(67) = batbdpn.msk|x
|
||||
Kill(68) = batbndo.msk|x
|
||||
Kill(69) = batbnot.msk|x
|
||||
Kill(70) = batbcco.msk|x
|
||||
|
||||
[cg]
|
||||
Data = 27-07-2020
|
||||
Descrizione = Contabilita' Generale
|
||||
Dischi = 1
|
||||
Edit_19 = cg0 -0
|
||||
Edit_20 = cg0 -1
|
||||
Edit_26 = cg0 -4
|
||||
Edit_5 = cg0 -5
|
||||
Moduli = ba
|
||||
OEM =
|
||||
Patch = 985
|
||||
PostProcess = bainst -0 CG
|
||||
PreProcess =
|
||||
Prezzo(1) =
|
||||
Prezzo(2) =
|
||||
Versione = 21511200
|
||||
|
||||
BIN
cd/test/cg0985a1.zip
Normal file
BIN
cd/test/cg0985a1.zip
Normal file
Binary file not shown.
3
cd/test/cg0988.txt
Normal file
3
cd/test/cg0988.txt
Normal file
@ -0,0 +1,3 @@
|
||||
cg2.exe
|
||||
|
||||
Aggiunta gestione dell'IVA indetraibile nel nuovo reverse charge
|
||||
98
cd/test/cg0988a.ini
Normal file
98
cd/test/cg0988a.ini
Normal file
@ -0,0 +1,98 @@
|
||||
[Main]
|
||||
Demo=0
|
||||
|
||||
[cg2]
|
||||
File(51) = cg2.exe|X
|
||||
Patch = 988
|
||||
Versione = 21511200
|
||||
|
||||
[cg99]
|
||||
Kill(0) = bastdpn.msk|x
|
||||
Kill(1) = batbins.msk|x
|
||||
Kill(2) = bastcve.msk|x
|
||||
Kill(3) = batbvet.msk|x
|
||||
Kill(4) = bastmsp.rep|x
|
||||
Kill(5) = bastnot.rep|x
|
||||
Kill(6) = batbntb.msk|x
|
||||
Kill(7) = bastcam.rep|x
|
||||
Kill(8) = bastnot.msk|x
|
||||
Kill(9) = cgtbcon.msk|x
|
||||
Kill(10) = bastdpn.rep|x
|
||||
Kill(11) = batblbu.msk|x
|
||||
Kill(12) = bastarb.msk|x
|
||||
Kill(13) = bastcco.msk|x
|
||||
Kill(14) = batbinl.msk|x
|
||||
Kill(15) = batbdel.msk|x
|
||||
Kill(16) = batbleg.msk|x
|
||||
Kill(17) = bastreg.msk|x
|
||||
Kill(18) = bastivd.msk|x
|
||||
Kill(19) = bastesc.rep|x
|
||||
Kill(20) = batbind.msk|x
|
||||
Kill(21) = bastcfi.msk|x
|
||||
Kill(22) = bastvet.rep|x
|
||||
Kill(23) = bastreg.rep|x
|
||||
Kill(24) = batbtra.msk|x
|
||||
Kill(25) = bastcam.msk|x
|
||||
Kill(26) = batbcco.msk|x
|
||||
Kill(27) = batbdpn.msk|x
|
||||
Kill(28) = cg2fppro.msk|x
|
||||
Kill(29) = bastarb.rep|x
|
||||
Kill(30) = batbcve.msk|x
|
||||
Kill(31) = bastscc.rep|x
|
||||
Kill(32) = bastzon.rep|x
|
||||
Kill(33) = bastpdb.msk|x
|
||||
Kill(34) = batbcfi.msk|x
|
||||
Kill(35) = bastscc.msk|x
|
||||
Kill(36) = bastver.msk|x
|
||||
Kill(37) = batbesc.msk|x
|
||||
Kill(38) = batbtit.msk|x
|
||||
Kill(39) = bastver.rep|x
|
||||
Kill(40) = bastleg.rep|x
|
||||
Kill(41) = bastntb.msk|x
|
||||
Kill(42) = bastpor.msk|x
|
||||
Kill(43) = bastntb.rep|x
|
||||
Kill(44) = batbcam.msk|x
|
||||
Kill(45) = bastcve.rep|x
|
||||
Kill(46) = bastivd.rep|x
|
||||
Kill(47) = batbscc.msk|x
|
||||
Kill(48) = bastzon.msk|x
|
||||
Kill(49) = bastndo.msk|x
|
||||
Kill(50) = batbivd.msk|x
|
||||
Kill(51) = batbmsp.msk|x
|
||||
Kill(52) = bastleg.msk|x
|
||||
Kill(53) = batbreg.msk|x
|
||||
Kill(54) = batblia.msk|x
|
||||
Kill(55) = bastvet.msk|x
|
||||
Kill(56) = bastcfi.rep|x
|
||||
Kill(57) = bastpor.rep|x
|
||||
Kill(58) = bastmsp.msk|x
|
||||
Kill(59) = batbnot.msk|x
|
||||
Kill(60) = batbndo.msk|x
|
||||
Kill(61) = bastpdb.rep|x
|
||||
Kill(62) = bastcco.rep|x
|
||||
Kill(63) = bastndo.rep|x
|
||||
Kill(64) = batbpdb.msk|x
|
||||
Kill(65) = batbzon.msk|x
|
||||
Kill(66) = bastesc.msk|x
|
||||
Kill(67) = batbpor.msk|x
|
||||
Kill(68) = batbarb.msk|x
|
||||
Kill(69) = batbver.msk|x
|
||||
Kill(70) = batblia.msk|x
|
||||
|
||||
[cg]
|
||||
Data = 27-07-2020
|
||||
Descrizione = Contabilita' Generale
|
||||
Dischi = 1
|
||||
Edit_19 = cg0 -0
|
||||
Edit_20 = cg0 -1
|
||||
Edit_26 = cg0 -4
|
||||
Edit_5 = cg0 -5
|
||||
Moduli = ba
|
||||
OEM =
|
||||
Patch = 988
|
||||
PostProcess = bainst -0 CG
|
||||
PreProcess =
|
||||
Prezzo(1) =
|
||||
Prezzo(2) =
|
||||
Versione = 21511200
|
||||
|
||||
BIN
cd/test/cg0988a1.zip
Normal file
BIN
cd/test/cg0988a1.zip
Normal file
Binary file not shown.
10
cd/test/li0988.txt
Normal file
10
cd/test/li0988.txt
Normal file
@ -0,0 +1,10 @@
|
||||
li0.exe
|
||||
li0100a.msk
|
||||
|
||||
riepilogo documenti/lettere – nel punto di menu non è possibile scegliere le numerazioni, nel mio caso vengono riepilogate
|
||||
e nel caso di ricalcolo e riporto probabilmente anche considerate le fatture provvisorie che giustamente
|
||||
hanno preso il numero lettera.
|
||||
|
||||
Riepilogo documenti/lettere – maiuscolo + f12 mi accende precarica se lo clicco mi chiede anno e cliente,
|
||||
ma l’ho già scelto nella richiesta parametri della pagina precedente, mi aspetterei che i dati della lettera
|
||||
vengano scritti sui documenti che ho a video in quel momento.
|
||||
20
cd/test/li0988a.ini
Normal file
20
cd/test/li0988a.ini
Normal file
@ -0,0 +1,20 @@
|
||||
[Main]
|
||||
Demo=0
|
||||
|
||||
[li0]
|
||||
File(0) = li0.exe|X
|
||||
File(1) = li0100a.msk|X
|
||||
Patch = 0988
|
||||
Versione = 21511200
|
||||
|
||||
[li]
|
||||
Data = 18-08-2020
|
||||
Descrizione = Dichiarazioni d'intento
|
||||
Dischi = 1
|
||||
Moduli = cg9
|
||||
OEM =
|
||||
Patch = 988
|
||||
PostProcess =
|
||||
PreProcess =
|
||||
Versione = 21511200
|
||||
|
||||
BIN
cd/test/li0988a1.zip
Normal file
BIN
cd/test/li0988a1.zip
Normal file
Binary file not shown.
3
cd/test/mg0988.txt
Normal file
3
cd/test/mg0988.txt
Normal file
@ -0,0 +1,3 @@
|
||||
mg1.exe
|
||||
|
||||
Corretta ricostruzione saldi nel caso di un record di magazzino che non esisteva
|
||||
30
cd/test/mg0988a.ini
Normal file
30
cd/test/mg0988a.ini
Normal file
@ -0,0 +1,30 @@
|
||||
[Main]
|
||||
Demo=0
|
||||
|
||||
[mg1]
|
||||
Edit_110 = mg1 -0
|
||||
File(36) = mg1.exe|X
|
||||
Patch = 988
|
||||
Versione = 21511200
|
||||
|
||||
[mg99]
|
||||
Kill(0) = batbubi.msk|x
|
||||
Kill(1) = batbfcg.msk|x
|
||||
Kill(2) = bastfcg.msk|x
|
||||
Kill(3) = eftbbnp.msk|x
|
||||
Kill(4) = efstbnp.msk|x
|
||||
Kill(5) = efstbnp.rep|x
|
||||
|
||||
[mg]
|
||||
Data = 12-08-2020
|
||||
Descrizione = Magazzino
|
||||
Dischi = 1
|
||||
Moduli = ba,cg9,ve9,pr9,ef9
|
||||
OEM =
|
||||
Patch = 988
|
||||
PostProcess = bainst -0 MG
|
||||
PreProcess =
|
||||
Prezzo(1) =
|
||||
Prezzo(2) =
|
||||
Versione = 21511200
|
||||
|
||||
BIN
cd/test/mg0988a1.zip
Normal file
BIN
cd/test/mg0988a1.zip
Normal file
Binary file not shown.
4
cd/test/ve0988.txt
Normal file
4
cd/test/ve0988.txt
Normal file
@ -0,0 +1,4 @@
|
||||
ve2.exe
|
||||
ve2400.msk
|
||||
|
||||
Corretto salvataggio giacenze in anagrafica di magazzino con Shift-F12
|
||||
130
cd/test/ve0988a.ini
Normal file
130
cd/test/ve0988a.ini
Normal file
@ -0,0 +1,130 @@
|
||||
[Main]
|
||||
Demo=0
|
||||
|
||||
[ve2]
|
||||
File(216) = ve2.exe|X
|
||||
File(226) = ve2400.msk|X
|
||||
Patch = 988
|
||||
Versione = 21511200
|
||||
|
||||
[ve99]
|
||||
Kill(0) = batbcld.msk|x
|
||||
Kill(1) = bastspp.rep|x
|
||||
Kill(2) = batbrfa.msk|x
|
||||
Kill(3) = bastgmc.rep|x
|
||||
Kill(4) = bastgcg.msk|x
|
||||
Kill(5) = batbcau.msk|x
|
||||
Kill(6) = bastcaa.rep|x
|
||||
Kill(7) = basttip.msk|x
|
||||
Kill(8) = batbfrr.msk|x
|
||||
Kill(9) = efstbnp.msk|x
|
||||
Kill(10) = bastfca.msk|x
|
||||
Kill(11) = batbfrm.msk|x
|
||||
Kill(12) = bastgca.msk|x
|
||||
Kill(13) = ve7.exe|x
|
||||
Kill(14) = batbtag.msk|x
|
||||
Kill(15) = batbtip.msk|x
|
||||
Kill(16) = batbgsa.msk|x
|
||||
Kill(17) = batbprv.msk|x
|
||||
Kill(18) = ve7300a.frm|x
|
||||
Kill(19) = batbpro.msk|x
|
||||
Kill(20) = batbbnp.msk|x
|
||||
Kill(21) = bastrfa.msk|x
|
||||
Kill(22) = batbstd.msk|x
|
||||
Kill(23) = bastabe.rep|x
|
||||
Kill(24) = basteld.rep|x
|
||||
Kill(25) = bastubi.rep|x
|
||||
Kill(26) = efstbnp.rep|x
|
||||
Kill(27) = ve7500a.msk|x
|
||||
Kill(28) = batbgca.msk|x
|
||||
Kill(29) = batbgcg.msk|x
|
||||
Kill(30) = bastgmc.msk|x
|
||||
Kill(31) = basttag.msk|x
|
||||
Kill(32) = basttri.rep|x
|
||||
Kill(33) = bastctr.rep|x
|
||||
Kill(34) = bastasf.rep|x
|
||||
Kill(35) = bastasf.msk|x
|
||||
Kill(36) = bastcra.msk|x
|
||||
Kill(37) = batbprs.msk|x
|
||||
Kill(38) = batbfca.msk|x
|
||||
Kill(39) = eftbbnp.msk|x
|
||||
Kill(40) = batbrfc.msk|x
|
||||
Kill(41) = bastfca.rep|x
|
||||
Kill(42) = ve7400a.msk|x
|
||||
Kill(43) = ve7300a.msk|x
|
||||
Kill(44) = bastums.msk|x
|
||||
Kill(45) = batbspt.msk|x
|
||||
Kill(46) = batbfsa.msk|x
|
||||
Kill(47) = basttip.rep|x
|
||||
Kill(48) = bastspp.msk|x
|
||||
Kill(49) = batbctr.msk|x
|
||||
Kill(50) = bastrfc.msk|x
|
||||
Kill(51) = bastnum.rep|x
|
||||
Kill(52) = ve7100a.msk|x
|
||||
Kill(53) = ve7400conf.ini|x
|
||||
Kill(54) = bastbnp.msk|x
|
||||
Kill(55) = bastimb.msk|x
|
||||
Kill(56) = bastfrd.msk|x
|
||||
Kill(57) = bastfrm.msk|x
|
||||
Kill(58) = batbgmc.msk|x
|
||||
Kill(59) = bastabe.msk|x
|
||||
Kill(60) = basttri.msk|x
|
||||
Kill(61) = batbums.msk|x
|
||||
Kill(62) = baststd.rep|x
|
||||
Kill(63) = batbfrd.msk|x
|
||||
Kill(64) = batbubi.msk|x
|
||||
Kill(65) = batbabe.msk|x
|
||||
Kill(66) = batbcaa.msk|x
|
||||
Kill(67) = bastfrm.rep|x
|
||||
Kill(68) = bastcaa.msk|x
|
||||
Kill(69) = basttag.rep|x
|
||||
Kill(70) = bastcau.rep|x
|
||||
Kill(71) = batbspp.msk|x
|
||||
Kill(72) = basteld.msk|x
|
||||
Kill(73) = batbfid.msk|x
|
||||
Kill(74) = ve7200a.frm|x
|
||||
Kill(75) = ve7200a.msk|x
|
||||
Kill(76) = batbtri.msk|x
|
||||
Kill(77) = ve7400a.ini|x
|
||||
Kill(78) = ve7600a.msk|x
|
||||
Kill(79) = bastrfa.rep|x
|
||||
Kill(80) = ve7700a.msk|x
|
||||
Kill(81) = bastnum.msk|x
|
||||
Kill(82) = bastprs.msk|x
|
||||
Kill(83) = bastfrr.rep|x
|
||||
Kill(84) = baststd.msk|x
|
||||
Kill(85) = batbmre.msk|x
|
||||
Kill(86) = bastrfc.rep|x
|
||||
Kill(87) = batbnum.msk|x
|
||||
Kill(88) = bastimb.rep|x
|
||||
Kill(89) = bastums.rep|x
|
||||
Kill(90) = bastprs.rep|x
|
||||
Kill(91) = bastgcg.rep|x
|
||||
Kill(92) = bastubi.msk|x
|
||||
Kill(93) = batbasf.msk|x
|
||||
Kill(94) = bastgca.rep|x
|
||||
Kill(95) = batbeld.msk|x
|
||||
Kill(96) = bastcra.rep|x
|
||||
Kill(97) = ve7701a.ini|x
|
||||
Kill(98) = batbacr.msk|x
|
||||
Kill(99) = batbimb.msk|x
|
||||
Kill(100) = bastfrr.msk|x
|
||||
Kill(101) = bastcau.msk|x
|
||||
Kill(102) = bastbnp.rep|x
|
||||
Kill(103) = bastctr.msk|x
|
||||
Kill(104) = batbcra.msk|x
|
||||
Kill(105) = bastfrd.rep|x
|
||||
|
||||
[ve]
|
||||
Data = 27-07-2020
|
||||
Descrizione = Vendite
|
||||
Dischi = 1
|
||||
Moduli = ba,cg9,pr9,mg9,sv9,in9,ef9
|
||||
OEM =
|
||||
Patch = 988
|
||||
PostProcess = bainst -0 VE
|
||||
PreProcess =
|
||||
Prezzo(1) =
|
||||
Prezzo(2) =
|
||||
Versione = 21511200
|
||||
|
||||
BIN
cd/test/ve0988a1.zip
Normal file
BIN
cd/test/ve0988a1.zip
Normal file
Binary file not shown.
@ -20,7 +20,7 @@
|
||||
|
||||
#include "cg1.h"
|
||||
#include "cg1100.h"
|
||||
#include "cglib01.h"
|
||||
#include "cglib.h"
|
||||
|
||||
enum stampe {
|
||||
completa=1,
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
#include "cg1313.h"
|
||||
#include "cg1314.h"
|
||||
|
||||
#include "cglib01.h"
|
||||
#include "cglib.h"
|
||||
|
||||
#include <mov.h>
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
#include <nditte.h>
|
||||
|
||||
#include "cg1302.h"
|
||||
#include "cglib01.h"
|
||||
#include "cglib.h"
|
||||
|
||||
const int TAgg_tconto::look_reg (const char* cod, int anno)
|
||||
{
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
//*****************************************************
|
||||
#include "cg1300.h"
|
||||
#include "cg1304.h"
|
||||
#include "cglib01.h"
|
||||
#include "cglib.h"
|
||||
|
||||
#include <mask.h>
|
||||
#include <progind.h>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
// sistema il codice esercizio di tutti i movimenti
|
||||
#include "cg1305.h"
|
||||
#include "cglib01.h"
|
||||
#include "cglib.h"
|
||||
|
||||
#include <mask.h>
|
||||
#include <progind.h>
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
#include <mask.h>
|
||||
#include <progind.h>
|
||||
#include <relation.h>
|
||||
#include "cglib01.h"
|
||||
#include "cglib.h"
|
||||
|
||||
#include <mov.h>
|
||||
#include "cg1300.h"
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
#include "cg1.h"
|
||||
#include "cg1700.h"
|
||||
#include "cglib01.h"
|
||||
#include "cglib.h"
|
||||
|
||||
enum descr {causale, conto};
|
||||
|
||||
|
||||
@ -462,7 +462,8 @@ bool TPrimanota_application::read_caus(const char* cod, int year)
|
||||
if (nriga >= 2 && nriga <= RIGA_REVERSE_CHARGE)
|
||||
continue; // Conti per IVA detraibile e non, ritenute sociali e fiscali
|
||||
|
||||
const char tipo = nriga == 1 ? 'T' : ' ';
|
||||
const char tipo = nriga == 1 ? cgrowtype_totale : cgrowtype_contabile;
|
||||
|
||||
if (nriga == 1 && tc.tipo() > ' ' && tc.ok())
|
||||
m->set(F_CODCLIFOR, tc.sottoconto());
|
||||
set_cgs_row(-1,zero,tc,desc,tipo);
|
||||
@ -1042,7 +1043,8 @@ void TPrimanota_application::init_modify_mode(TMask& m)
|
||||
for (int i = cg.items()-1; i >= 0 && _as400; i--)
|
||||
{
|
||||
const char rt = row_type(cg.row(i));
|
||||
_as400 = rt <= ' ';
|
||||
|
||||
_as400 = rt <= cgrowtype_contabile;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1456,7 +1458,7 @@ void TPrimanota_application::mask2rel(const TMask& m)
|
||||
|
||||
// Roba obsoleta allo stato brado
|
||||
const TBill c(row, cid2index(IVA_TIPO), 0x1);
|
||||
const int rimp = bill2pos(c, 'I')+1;
|
||||
const int rimp = bill2pos(c, cgrowtype_imponibile) + 1;
|
||||
r.put(RMI_RIGAIMP, rimp);
|
||||
c.put(r);
|
||||
r.put(RMI_NAVP, row.get(cid2index(IVA_NOTAVARECF)));
|
||||
@ -1487,12 +1489,19 @@ void TPrimanota_application::check_saldi()
|
||||
|
||||
void TPrimanota_application::write_fppro()
|
||||
{
|
||||
#ifdef DBG
|
||||
if (!ini_get_bool(CONFIG_INSTALL, "Main", "SkipFPPRO"))
|
||||
{
|
||||
#endif
|
||||
// Controllo se la registrazione ha avuto effetto anche su FPPRO allora salvo riferimento sul mov
|
||||
if (save_fppro() > 0 && !save_dbmov())
|
||||
message_box(
|
||||
"ATTENZIONE: non e' stato possibile salvare i riferimenti del documento in ingresso per questo movimento.\n"
|
||||
"Movimento registrato senza collegamento ai documenti in ingresso.");
|
||||
#ifdef DBG
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
bool TPrimanota_application::has_tot_doc(TToken_string& fppro_keys)
|
||||
{
|
||||
@ -2065,14 +2074,14 @@ long TPrimanota_application::calcola_m770(int tipo_coll, real& spese, real& comp
|
||||
iva += imposta;
|
||||
}
|
||||
|
||||
i = type2pos('F');
|
||||
i = type2pos(cgrowtype_ritfis);
|
||||
if (i >= 0)
|
||||
{
|
||||
TImporto imp; imp = cgs().row(i);
|
||||
ritfis = imp.valore();
|
||||
}
|
||||
|
||||
i = type2pos('S');
|
||||
i = type2pos(cgrowtype_ritsoc);
|
||||
if (i >= 0)
|
||||
{
|
||||
TImporto imp; imp = cgs().row(i);
|
||||
@ -2255,8 +2264,12 @@ HIDDEN bool add_not_empty(TToken_string& str, int pos, TConfig& ini, const char*
|
||||
|
||||
void TPrimanota_application::ini2mask(TConfig& ini, TMask& msk, bool query)
|
||||
{
|
||||
static TString __tipi_riga;
|
||||
TRelation_application::ini2mask(ini, msk, query);
|
||||
bool scad_from_ini = false;
|
||||
|
||||
if (__tipi_riga.blank())
|
||||
__tipi_riga << (char) cgrowtype_contabile << (char) cgrowtype_IVAdet << (char) cgrowtype_imponibile << (char) cgrowtype_IVAnondet << (char) cgrowtype_totale;
|
||||
if (query)
|
||||
{
|
||||
set_not_empty(msk, F_CODCAUS, ini, MOV_CODCAUS);
|
||||
@ -2318,15 +2331,17 @@ void TPrimanota_application::ini2mask(TConfig& ini, TMask& msk, bool query)
|
||||
}
|
||||
|
||||
// Genera eventuali righe per ritenute fiscali e sociali
|
||||
const short frit[4] = { F_RITFIS, F_RITSOC, F_REVCHARGE, 0 };
|
||||
const char trit[4] = { 'F', 'S', 'V', '\0' };
|
||||
static const short __frit[4] = {F_RITFIS, F_RITSOC, F_REVCHARGE, 0};
|
||||
static TString4 __trit;
|
||||
|
||||
if (__trit.blank())
|
||||
__trit << cgrowtype_ritfis << cgrowtype_ritsoc << cgrowtype_revcharge;
|
||||
|
||||
for (int i = 0; frit[i]; i++)
|
||||
for (int i = 0; __frit[i]; i++)
|
||||
{
|
||||
TEdit_field& ritfld = msk.efield(frit[i]);
|
||||
TEdit_field& ritfld = msk.efield(__frit[i]);
|
||||
if (!ritfld.empty() && ritfld.active())
|
||||
add_cgs_ritenute(trit[i]);
|
||||
add_cgs_ritenute(__trit[i]);
|
||||
}
|
||||
calcola_imp(); // Calcola totale imponibile ed imposte
|
||||
}
|
||||
@ -2335,7 +2350,9 @@ void TPrimanota_application::ini2mask(TConfig& ini, TMask& msk, bool query)
|
||||
for (int i = 0; ini.set_paragraph(format("%d,%d", LF_RMOV, i + 1)); i++)
|
||||
{
|
||||
char tipo = ini.get_char(RMV_ROWTYPE);
|
||||
if (tipo < ' ') tipo = ' ';
|
||||
|
||||
if (tipo < cgrowtype_contabile)
|
||||
tipo = cgrowtype_contabile;
|
||||
|
||||
TBill conto; ini2bill(ini, conto, false);
|
||||
if (_as400 && conto.tipo() <= ' ')
|
||||
@ -2346,18 +2363,18 @@ void TPrimanota_application::ini2mask(TConfig& ini, TMask& msk, bool query)
|
||||
{
|
||||
numrig = -1; // Normalmente aggiungi la riga in fondo
|
||||
// Cerca una riga che abbia già il tipo ed il conto richiesto
|
||||
if (strchr(" DINT", tipo) != nullptr)
|
||||
if (strchr(__tipi_riga, tipo) != nullptr)
|
||||
{
|
||||
int nr = -1;
|
||||
if (tipo == 'I' || tipo == ' ')
|
||||
if (tipo == cgrowtype_imponibile || tipo == cgrowtype_contabile)
|
||||
nr = bill2pos(conto, tipo);
|
||||
else
|
||||
nr = type2pos(tipo);
|
||||
|
||||
if (nr < 0)
|
||||
tipo = ' ';
|
||||
tipo = cgrowtype_contabile;
|
||||
else
|
||||
if (get_cgs_imp(nr).is_zero() || tipo == 'T')
|
||||
if (get_cgs_imp(nr).is_zero() || tipo == cgrowtype_totale)
|
||||
numrig = nr;
|
||||
}
|
||||
}
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
#include <diction.h>
|
||||
#include <tabutil.h>
|
||||
|
||||
|
||||
///////////////////////////////////////////////////////////
|
||||
// Movimento di prima nota
|
||||
///////////////////////////////////////////////////////////
|
||||
@ -103,10 +104,6 @@ int TMovimentoPN::read_mov_rows()
|
||||
_iva.read(ivafilter);
|
||||
update_rev_charge();
|
||||
_old_iva = _iva;
|
||||
/*
|
||||
if (_cg.rows() > 0 && _iva.rows() > 0 && cg(0).get_char(RMV_ROWTYPE) != 'T')
|
||||
adjust_row_types();
|
||||
*/
|
||||
return _cg.rows();
|
||||
}
|
||||
|
||||
@ -400,74 +397,74 @@ int TMovimentoPN::remove()
|
||||
class TConti_array : private TAssoc_array
|
||||
{
|
||||
public: // TObject
|
||||
virtual bool ok() const { return items() != 0; }
|
||||
virtual bool ok() const { return items() != 0; }
|
||||
|
||||
public:
|
||||
bool add(const TBill& conto, const real& importo);
|
||||
real importo(const TBill& conto);
|
||||
bool remove(const TBill& conto);
|
||||
bool add(const TBill& conto, const real& importo);
|
||||
real importo(const TBill& conto);
|
||||
bool remove(const TBill& conto);
|
||||
|
||||
bool add_iva(bool det, const real& importo);
|
||||
real importo_iva(bool det);
|
||||
bool remove_iva(bool det);
|
||||
bool add_iva(bool det, const real& importo);
|
||||
real importo_iva(bool det);
|
||||
bool remove_iva(bool det);
|
||||
|
||||
TConti_array() {}
|
||||
virtual ~TConti_array() {}
|
||||
TConti_array() {}
|
||||
virtual ~TConti_array() {}
|
||||
};
|
||||
|
||||
bool TConti_array::add(const TBill& conto, const real& importo)
|
||||
{
|
||||
const char* key = conto.string();
|
||||
real* imp = (real*)objptr(key);
|
||||
const char* key = conto.string();
|
||||
real* imp = (real*)objptr(key);
|
||||
|
||||
if (imp == nullptr)
|
||||
TAssoc_array::add(key, importo);
|
||||
else
|
||||
*imp += importo;
|
||||
return imp != nullptr;
|
||||
if (imp == nullptr)
|
||||
TAssoc_array::add(key, importo);
|
||||
else
|
||||
*imp += importo;
|
||||
return imp != nullptr;
|
||||
}
|
||||
|
||||
real TConti_array::importo(const TBill& conto)
|
||||
{
|
||||
const char* key = conto.string();
|
||||
const real* imp = (real*)objptr(key);
|
||||
return imp ? *imp : ZERO;
|
||||
const char* key = conto.string();
|
||||
const real* imp = (real*)objptr(key);
|
||||
return imp ? *imp : ZERO;
|
||||
}
|
||||
|
||||
bool TConti_array::remove(const TBill& conto)
|
||||
{
|
||||
const char* key = conto.string();
|
||||
return TAssoc_array::remove(key);
|
||||
const char* key = conto.string();
|
||||
return TAssoc_array::remove(key);
|
||||
}
|
||||
|
||||
bool TConti_array::add_iva(bool det, const real& importo)
|
||||
{
|
||||
real* imp = nullptr;
|
||||
real* imp = nullptr;
|
||||
|
||||
if (!importo.is_zero())
|
||||
{
|
||||
const char* const key = det ? "D" : "N";
|
||||
if (!importo.is_zero())
|
||||
{
|
||||
const char* const key = det ? "D" : "N";
|
||||
|
||||
imp = (real*)objptr(key);
|
||||
if (imp == nullptr)
|
||||
TAssoc_array::add(key, importo);
|
||||
else
|
||||
*imp += importo;
|
||||
}
|
||||
return imp != nullptr;
|
||||
imp = (real*)objptr(key);
|
||||
if (imp == nullptr)
|
||||
TAssoc_array::add(key, importo);
|
||||
else
|
||||
*imp += importo;
|
||||
}
|
||||
return imp != nullptr;
|
||||
}
|
||||
|
||||
real TConti_array::importo_iva(bool det)
|
||||
{
|
||||
const char* const key = det ? "D" : "N";
|
||||
const real* imp = (real*)objptr(key);
|
||||
return imp ? *imp : ZERO;
|
||||
const char* const key = det ? "D" : "N";
|
||||
const real* imp = (real*)objptr(key);
|
||||
return imp ? *imp : ZERO;
|
||||
}
|
||||
|
||||
bool TConti_array::remove_iva(bool det)
|
||||
{
|
||||
const char* const key = det ? "D" : "N";
|
||||
return TAssoc_array::remove(key);
|
||||
const char* const key = det ? "D" : "N";
|
||||
return TAssoc_array::remove(key);
|
||||
}
|
||||
|
||||
real TMovimentoPN::indetraibile_al(const TString& codind, const TCausale& caus, int annodoc) const
|
||||
|
||||
@ -13,6 +13,7 @@
|
||||
#include "cg2100.h"
|
||||
#include "cg2102.h"
|
||||
#include "cg21sld.h"
|
||||
#include "cglib.h"
|
||||
|
||||
#include <clifo.h>
|
||||
#include <cfven.h>
|
||||
@ -29,13 +30,13 @@
|
||||
// Determina il tipo di una riga contabile in formato TToken_string
|
||||
char TPrimanota_application::row_type(const TToken_string& s)
|
||||
{
|
||||
char t = ' ';
|
||||
char t = cgrowtype_contabile;
|
||||
|
||||
if (s.full())
|
||||
{
|
||||
s.get(cid2index(CG_ROWTYPE), t);
|
||||
if (!((t >= 'A' && t <= 'Z')||((t >= '0' && t <= '9')))) // is not alphanumeric?
|
||||
t = ' ';
|
||||
t = cgrowtype_contabile;
|
||||
}
|
||||
return t;
|
||||
}
|
||||
@ -274,20 +275,21 @@ TImporto TPrimanota_application::real2imp(const real& r, char row_type)
|
||||
|
||||
switch (row_type)
|
||||
{
|
||||
case 'S':
|
||||
case cgrowtype_ritsoc:
|
||||
dare = causale().sezione_ritsoc() == 'D';
|
||||
break;
|
||||
case 'V':
|
||||
case cgrowtype_revcharge:
|
||||
dare = causale().sezione_revcharge() == 'D';
|
||||
break;
|
||||
default:
|
||||
dare = causale().sezione_clifo() == 'D';
|
||||
if (row_type != 'T' && row_type != 'F')
|
||||
if (row_type != cgrowtype_totale && row_type != cgrowtype_ritfis)
|
||||
dare = !dare;
|
||||
break;
|
||||
}
|
||||
|
||||
TImporto importo(dare ? 'D' : 'A', r);
|
||||
|
||||
return importo;
|
||||
}
|
||||
|
||||
@ -299,7 +301,7 @@ void TPrimanota_application::disable_cgs_cells(int n, char tipo)
|
||||
int first = 0, last = 0; // Range di colonne da disabilitare
|
||||
switch(tipo)
|
||||
{
|
||||
case 'T': // Totale documento
|
||||
case cgrowtype_totale: // Totale documento
|
||||
if (causale().corrispettivi())
|
||||
{
|
||||
last = 2;
|
||||
@ -311,25 +313,25 @@ void TPrimanota_application::disable_cgs_cells(int n, char tipo)
|
||||
cg.disable_cell(n, 6);
|
||||
}
|
||||
break;
|
||||
case 'A': // Abbuoni attivi
|
||||
case 'C': // Differenza cambio
|
||||
case 'D': // IVA Detraibile
|
||||
case 'F': // Ritenute Fiscali
|
||||
case 'L': // Contropartita delle spese
|
||||
case 'N': // IVA Non detraibile
|
||||
case 'P': // Abbuoni passivi
|
||||
case 'R': // Ritenute professionali
|
||||
case 'S': // Ritenute Sociali
|
||||
case 'V': // Reverse charge
|
||||
case '2': // IVA per scissione pagamenti art.17-ter DPR 633/72
|
||||
case cgrowtype_abbattivo: // Abbuoni attivi
|
||||
case cgrowtype_diffcambio: // Differenza cambio
|
||||
case cgrowtype_IVAdet: // IVA Detraibile
|
||||
case cgrowtype_ritfis: // Ritenute Fiscali
|
||||
case cgrowtype_contrspesa: // Contropartita delle spese
|
||||
case cgrowtype_IVAnondet: // IVA Non detraibile
|
||||
case cgrowtype_abbpassivo: // Abbuoni passivi
|
||||
case cgrowtype_ritprof: // Ritenute professionali
|
||||
case cgrowtype_ritsoc: // Ritenute Sociali
|
||||
case cgrowtype_revcharge: // Reverse charge
|
||||
case cgrowtype_IVAsplit: // IVA per scissione pagamenti art.17-ter DPR 633/72
|
||||
last = 3;
|
||||
break;
|
||||
case 'K': // Riga cliente/fornitore per saldaconto
|
||||
case cgrowtype_cliforsc: // Riga cliente/fornitore per saldaconto
|
||||
if (curr_mask().is_running() && n == cg.items()-1) // Sono in inserimento di una riga nuova
|
||||
break;
|
||||
first = 2;
|
||||
case 'I': // Imponibile o contropartita saldaconto
|
||||
case '1': // Cliente per scissione pagamenti art.17-ter DPR 633/72
|
||||
case cgrowtype_imponibile: // Imponibile o contropartita saldaconto
|
||||
case cgrowtype_clisplit: // Cliente per scissione pagamenti art.17-ter DPR 633/72
|
||||
last = 7;
|
||||
break;
|
||||
default:
|
||||
@ -382,7 +384,7 @@ int TPrimanota_application::set_cgs_row(int n, const TImporto& imp,
|
||||
row.add(conto.string(0x3));
|
||||
row.add(""); // Codice decrizione
|
||||
row.add(desc); // Descrizione aggiuntiva
|
||||
if (tipo == 'T') // Calcolo contropartita
|
||||
if (tipo == cgrowtype_totale) // Calcolo contropartita
|
||||
{
|
||||
TToken_string & irow = ivas().row(0);
|
||||
TBill contro(irow, 5, 0x3);
|
||||
@ -394,7 +396,7 @@ int TPrimanota_application::set_cgs_row(int n, const TImporto& imp,
|
||||
}
|
||||
else
|
||||
{
|
||||
const int pos = type2pos('T');
|
||||
const int pos = type2pos(cgrowtype_totale);
|
||||
|
||||
if (pos >= 0)
|
||||
{
|
||||
@ -457,14 +459,14 @@ void TPrimanota_application::cgs_pack()
|
||||
TToken_string& r = rows.row(i);
|
||||
const char rt = row_type(r);
|
||||
|
||||
rowtypes_present |= (rt > ' ');
|
||||
rowtypes_present |= (rt > cgrowtype_contabile);
|
||||
|
||||
bool kill = can_remove(r);
|
||||
if (kill)
|
||||
{
|
||||
if (pagamento)
|
||||
{
|
||||
if (rt == 'K')
|
||||
if (rt == cgrowtype_cliforsc)
|
||||
{
|
||||
kill = !partite().utilizzata(numreg, i+1);
|
||||
if (kill)
|
||||
@ -474,7 +476,7 @@ void TPrimanota_application::cgs_pack()
|
||||
else
|
||||
{
|
||||
// Non eliminare lre righe cliente delle fatture a zero
|
||||
if (rt == 'T' && r.get_char(2)>='C' && curr_mask().get_real(F_TOTALE).is_zero())
|
||||
if (rt == cgrowtype_totale && r.get_char(2)>='C' && curr_mask().get_real(F_TOTALE) == ZERO)
|
||||
kill = false;
|
||||
}
|
||||
if (kill)
|
||||
@ -655,7 +657,7 @@ bool TPrimanota_application::cg_handler(TMask_field& f, KEY k)
|
||||
empty = false;
|
||||
if (paga || nota)
|
||||
{
|
||||
if (tipo == 'K' || tipo == 'T' || a._as400)
|
||||
if (tipo == cgrowtype_cliforsc || tipo == cgrowtype_totale || a._as400)
|
||||
{
|
||||
const int currig = i+1;
|
||||
const TImporto speso = a.partite().importo_speso(numreg, currig);
|
||||
@ -718,7 +720,7 @@ bool TPrimanota_application::cg_handler(TMask_field& f, KEY k)
|
||||
const TImporto imp_spe(importo.sezione(), spe.get_num());
|
||||
saldaconto_val += imp_spe;
|
||||
} else
|
||||
if (tipo == 'K' || tipo == 'T')
|
||||
if (tipo == cgrowtype_cliforsc || tipo == cgrowtype_totale)
|
||||
saldaconto_val += a.partite().importo_speso(numreg, i+1, true, 0x1);
|
||||
}
|
||||
}
|
||||
@ -726,7 +728,7 @@ bool TPrimanota_application::cg_handler(TMask_field& f, KEY k)
|
||||
}
|
||||
else
|
||||
{
|
||||
if (tipo == 'T' && a.is_fattura())
|
||||
if (tipo == cgrowtype_totale && a.is_fattura())
|
||||
{
|
||||
const TBill c(r, 2, 0x1);
|
||||
if (c.tipo() >= 'C') // Riga cliente/fornitore
|
||||
@ -823,7 +825,7 @@ void TPrimanota_application::generazione_righe_cg(int r)
|
||||
if (contro.ok())
|
||||
{
|
||||
importo.swap_section(); // Inverto la sezione D/A
|
||||
set_cgs_row(1, importo, contro, "", ' ');
|
||||
set_cgs_row(1, importo, contro, "", cgrowtype_contabile);
|
||||
TBill conto(row, 2, 0x3);
|
||||
conto.add_to(cg.row(1), 9, 0x3);
|
||||
cg.force_update(1);
|
||||
@ -911,7 +913,7 @@ int TPrimanota_application::crea_somma_spese(TImporto& imp)
|
||||
TBill cassa; causale().bill(2, cassa);
|
||||
const TString desc(causale().desc_agg(2));
|
||||
imp.swap_section(); imp.normalize();
|
||||
const int r = set_cgs_row(-1, imp, cassa, desc, 'L');
|
||||
const int r = set_cgs_row(-1, imp, cassa, desc, cgrowtype_contrspesa);
|
||||
cgs().force_update();
|
||||
return r;
|
||||
}
|
||||
@ -1012,7 +1014,7 @@ bool TPrimanota_application::cg_notify(TSheet_field& cg, int r, KEY k)
|
||||
{
|
||||
if (delete_l)
|
||||
{
|
||||
const int l = type2pos('L');
|
||||
const int l = type2pos(cgrowtype_contrspesa);
|
||||
CHECK(l >= 0, "Impossibile cancellare riga di tipo L");
|
||||
cg.destroy(l);
|
||||
delete_l = false;
|
||||
@ -1030,7 +1032,7 @@ bool TPrimanota_application::cg_notify(TSheet_field& cg, int r, KEY k)
|
||||
switch(k)
|
||||
{
|
||||
case K_SPACE:
|
||||
if (tipo == 'G')
|
||||
if (tipo == cgrowtype_spese)
|
||||
old_spesa = row;
|
||||
else
|
||||
old_spesa.valore() = ZERO;
|
||||
@ -1039,9 +1041,10 @@ bool TPrimanota_application::cg_notify(TSheet_field& cg, int r, KEY k)
|
||||
if (!selecting)
|
||||
{
|
||||
TMask& sm = cg.sheet_mask();
|
||||
sm.enable(DLG_DELREC, tipo <= ' ' || tipo == 'K' || tipo == 'G');
|
||||
sm.enable(CG_RATEO, tipo <= ' ');
|
||||
sm.enable(CG_RISCONTO, tipo <= ' ');
|
||||
|
||||
sm.enable(DLG_DELREC, tipo <= cgrowtype_contabile || tipo == cgrowtype_cliforsc || tipo == cgrowtype_spese);
|
||||
sm.enable(CG_RATEO, tipo <= cgrowtype_contabile);
|
||||
sm.enable(CG_RISCONTO, tipo <= cgrowtype_contabile);
|
||||
if (row.empty_items())
|
||||
{
|
||||
selecting = true;
|
||||
@ -1052,7 +1055,7 @@ bool TPrimanota_application::cg_notify(TSheet_field& cg, int r, KEY k)
|
||||
}
|
||||
break;
|
||||
case K_DEL:
|
||||
if (tipo == 'G')
|
||||
if (tipo == cgrowtype_spese)
|
||||
{
|
||||
if (old_spesa.is_zero())
|
||||
old_spesa = row;
|
||||
@ -1061,18 +1064,18 @@ bool TPrimanota_application::cg_notify(TSheet_field& cg, int r, KEY k)
|
||||
}
|
||||
else
|
||||
{
|
||||
if (tipo == 'K')
|
||||
if (tipo == cgrowtype_cliforsc)
|
||||
a.notify_cgline_deletion(r+1);
|
||||
break;
|
||||
}
|
||||
case K_ENTER:
|
||||
if (tipo == 'G')
|
||||
if (tipo == cgrowtype_spese)
|
||||
{
|
||||
TImporto growth; growth = row; growth -= old_spesa;
|
||||
|
||||
if (!growth.is_zero())
|
||||
{
|
||||
const int s = type2pos('L');
|
||||
const int s = type2pos(cgrowtype_contrspesa);
|
||||
if (s < 0)
|
||||
a.crea_somma_spese(growth);
|
||||
else
|
||||
@ -1093,16 +1096,17 @@ bool TPrimanota_application::cg_notify(TSheet_field& cg, int r, KEY k)
|
||||
if (a.is_pagamento())
|
||||
{
|
||||
const char tipo = cg.mask().get(SK_TIPORIGA)[0];
|
||||
if (tipo == 'K' || tipo == 'G')
|
||||
|
||||
if (tipo == cgrowtype_cliforsc || tipo == cgrowtype_spese)
|
||||
{
|
||||
const int k = tipo == 'K' ? 1 : RIGA_SPESE;
|
||||
const int k = tipo == cgrowtype_cliforsc ? 1 : RIGA_SPESE;
|
||||
TBill conto; a.causale().bill(k, conto);
|
||||
const TString desc(a.causale().desc_agg(k));
|
||||
const char sez = a.causale().sezione(k);
|
||||
const real imp = cg.mask().get_real(K_RESIDUO);
|
||||
TImporto importo(sez, imp); importo.normalize();
|
||||
|
||||
if (tipo == 'G')
|
||||
if (tipo == cgrowtype_spese)
|
||||
{
|
||||
const char sezbanca = a.causale().sezione(2);
|
||||
if (sezbanca == sez)
|
||||
@ -1111,12 +1115,13 @@ bool TPrimanota_application::cg_notify(TSheet_field& cg, int r, KEY k)
|
||||
|
||||
a.set_cgs_row(r, importo, conto, desc, tipo);
|
||||
|
||||
if (tipo == 'K')
|
||||
if (tipo == cgrowtype_cliforsc)
|
||||
{
|
||||
for (int i = 0; i < r; i++)
|
||||
{
|
||||
const TToken_string& row = cg.row(i);
|
||||
if (row_type(row) != 'K')
|
||||
|
||||
if (row_type(row) != cgrowtype_cliforsc)
|
||||
{
|
||||
cg.swap_rows(r, i);
|
||||
cg.post_select(i);
|
||||
@ -1128,7 +1133,7 @@ bool TPrimanota_application::cg_notify(TSheet_field& cg, int r, KEY k)
|
||||
{
|
||||
if (!importo.is_zero())
|
||||
{
|
||||
const int s = type2pos('L');
|
||||
const int s = type2pos(cgrowtype_contrspesa);
|
||||
if (s < 0)
|
||||
a.crea_somma_spese(importo);
|
||||
else
|
||||
@ -1152,7 +1157,7 @@ bool TPrimanota_application::descr_handler(TMask_field& f, KEY k)
|
||||
{
|
||||
if (app().iva() != nessuna_iva)
|
||||
{
|
||||
const int first = type2pos('T');
|
||||
const int first = type2pos(cgrowtype_totale);
|
||||
if (first >= 0)
|
||||
{
|
||||
TSheet_field& cg = app().cgs();
|
||||
@ -1457,14 +1462,13 @@ void TPrimanota_application::ivas_pack()
|
||||
rows.pack(); // Pack array
|
||||
}
|
||||
|
||||
int TPrimanota_application::get_importi_iva(const TToken_string& row,
|
||||
real& imp_det, real& iva_det,
|
||||
real& imp_ind, real& iva_ind)
|
||||
int TPrimanota_application::get_importi_iva(TToken_string& row, real& imp_det, real& iva_det,
|
||||
real& imp_ind, real& iva_ind)
|
||||
{
|
||||
real imptot; row.get(0, imptot); // Importo scritto nella riga iva
|
||||
TString4 zanicchi; row.get(1, zanicchi); // Codice IVA
|
||||
TString4 codind; row.get(2, codind); // Codice indetraibilità
|
||||
real ivatot; row.get(3, ivatot); // Imposta scritta nella riga iva
|
||||
const real imptot = row.get_real(cid2index(IVA_IMPONIBILE)); // Importo scritto nella riga iva
|
||||
const TString4 zanicchi = row.get(cid2index(IVA_CODIVA)); // Codice IVA
|
||||
const TString4 codind = row.get(cid2index(IVA_INDETRAIBILE)); // Codice indetraibilità
|
||||
const real ivatot = row.get_real(cid2index(IVA_IMPOSTA)); // Imposta scritta nella riga iva
|
||||
|
||||
int annodoc = app()._msk[2]->get_date(F_DATADOC).year();
|
||||
if (annodoc <= 0)
|
||||
@ -1487,19 +1491,24 @@ void TPrimanota_application::add2cg_row(TSheet_field& s, TToken_string & row, TS
|
||||
const TCausale& cau = a.causale();
|
||||
const bool acquisto = (a.iva() == iva_acquisti);
|
||||
const int last = acquisto ? 3 : 2;
|
||||
const char tipi[3] = { 'N', 'D', 'V' };
|
||||
static TString8 __tipi;
|
||||
|
||||
if (__tipi.blank())
|
||||
__tipi << (char) cgrowtype_IVAnondet << (char) cgrowtype_IVAdet << (char) cgrowtype_revcharge;
|
||||
|
||||
|
||||
real imp_det, iva_det, imp_ind, iva_ind;
|
||||
const bool revcharge = row.get_bool(cid2index(IVA_REVCHARGE));
|
||||
get_importi_iva(row, imp_det, iva_det, imp_ind, iva_ind);
|
||||
|
||||
for (int d = 0; d < last; d++)
|
||||
{
|
||||
const char tipod = tipi[d];
|
||||
const char tipod = __tipi[d];
|
||||
|
||||
if (d < 2)
|
||||
{
|
||||
const TBill conto(row, cid2index(IVA_TIPO), 0x1);
|
||||
const int pos = bill2pos(conto, 'I'); // Riga in cui andra' l'imponibile
|
||||
const int pos = bill2pos(conto, cgrowtype_imponibile); // Riga in cui andra' l'imponibile
|
||||
const TImporto imp = a.real2imp(d > 0 ? imp_det : imp_ind, tipod); // Imponibile
|
||||
|
||||
if (pos >= 0) // Se il conto esisteva anche prima ...
|
||||
@ -1522,7 +1531,7 @@ void TPrimanota_application::add2cg_row(TSheet_field& s, TToken_string & row, TS
|
||||
else
|
||||
{
|
||||
if (add && conto.ok() && !imp.is_zero()) // Se c'e' imponibile ...
|
||||
a.set_cgs_row(-1, imp, conto, (saved_descr.objptr(d) == nullptr || saved_descr.row(d).blank()) ? cau.desc_agg(2) : saved_descr.row(d), 'I');
|
||||
a.set_cgs_row(-1, imp, conto, (saved_descr.objptr(d) == nullptr || saved_descr.row(d).blank()) ? cau.desc_agg(2) : saved_descr.row(d), cgrowtype_imponibile);
|
||||
}
|
||||
}
|
||||
// Aggiorna conto IVA sulla riga contabile
|
||||
@ -1530,7 +1539,12 @@ void TPrimanota_application::add2cg_row(TSheet_field& s, TToken_string & row, TS
|
||||
real imposta(d > 0 ? iva_det : iva_ind);
|
||||
|
||||
if (d == 2)
|
||||
imposta = revcharge ? imposta : ZERO;
|
||||
{
|
||||
TBill billind; cau.bill(RIGA_IVA_NON_DETRAIBILE, billind);
|
||||
const bool iva_ind_al_costo = !billind.ok();
|
||||
|
||||
imposta = revcharge ? row.get_real(cid2index(IVA_IMPOSTA)) : ZERO;
|
||||
}
|
||||
|
||||
TImporto iva = a.real2imp(imposta, tipod); // Imponibile
|
||||
TImporto i(a.get_cgs_imp(posiva));
|
||||
@ -1618,7 +1632,7 @@ bool TPrimanota_application::iva_notify(TSheet_field& s, int r, KEY k)
|
||||
if (acquisto_revcharge)
|
||||
{
|
||||
TImporto tot_revcharge;
|
||||
const int posiva = type2pos('V');
|
||||
const int posiva = type2pos(cgrowtype_revcharge);
|
||||
TEdit_field & revcharge = a.curr_mask().efield(F_REVCHARGE);
|
||||
|
||||
if (posiva >= 0)
|
||||
@ -1633,27 +1647,27 @@ bool TPrimanota_application::iva_notify(TSheet_field& s, int r, KEY k)
|
||||
|
||||
if (m.get_int(F_ANNOIVA) >= 2015 && (tipocf == "C") && a.get_version() >= 12)
|
||||
{
|
||||
const int r_norm = type2pos('D');
|
||||
const int r_norm = type2pos(cgrowtype_IVAdet);
|
||||
const bool split_needed = r_norm >= 0 && a.is_split_payment();
|
||||
|
||||
if (split_needed)
|
||||
{
|
||||
TImporto imp_split = a.get_cgs_imp(r_norm);
|
||||
const int r_split1 = type2pos('1');
|
||||
const int r_split1 = type2pos(cgrowtype_clisplit);
|
||||
|
||||
if (r_split1 < 0)
|
||||
{
|
||||
const int r_tot = max(0, type2pos('T'));
|
||||
const int r_tot = max(0, type2pos(cgrowtype_totale));
|
||||
TToken_string row_tot = a.cgs().row(r_tot);
|
||||
TBill cliente_split(row_tot, 2, 0x1); // Imposta anche tipo = Cliente
|
||||
const char* desc = TR("IVA art.17-ter D.P.R. 633/1972");
|
||||
|
||||
a.set_cgs_row(-1, imp_split, cliente_split, desc, '1');
|
||||
a.set_cgs_row(-1, imp_split, cliente_split, desc, cgrowtype_clisplit);
|
||||
}
|
||||
else
|
||||
a.set_cgs_imp(r_split1, imp_split);
|
||||
|
||||
const int r_split2 = type2pos('2');
|
||||
const int r_split2 = type2pos(cgrowtype_IVAsplit);
|
||||
|
||||
imp_split.swap_section();
|
||||
if (r_split2 < 0)
|
||||
@ -1662,19 +1676,19 @@ bool TPrimanota_application::iva_notify(TSheet_field& s, int r, KEY k)
|
||||
TBill iva_split(row_norm, 3);
|
||||
const char* desc = TR("IVA art.17-ter D.P.R. 633/1972");
|
||||
|
||||
a.set_cgs_row(-1, imp_split, iva_split, desc, '2');
|
||||
a.set_cgs_row(-1, imp_split, iva_split, desc, cgrowtype_IVAsplit);
|
||||
}
|
||||
else
|
||||
a.set_cgs_imp(r_split2, imp_split);
|
||||
}
|
||||
else
|
||||
{
|
||||
const int r_split2 = type2pos('2');
|
||||
const int r_split2 = type2pos(cgrowtype_IVAsplit);
|
||||
|
||||
if (r_split2 >= 0)
|
||||
a.reset_cgs_row(r_split2);
|
||||
|
||||
const int r_split1 = type2pos('1');
|
||||
const int r_split1 = type2pos(cgrowtype_clisplit);
|
||||
|
||||
if (r_split1 >= 0)
|
||||
a.reset_cgs_row(r_split1);
|
||||
@ -1797,7 +1811,7 @@ bool TPrimanota_application::cg_conto_handler(TMask_field& f, KEY key)
|
||||
{
|
||||
TMask& m = f.mask();
|
||||
|
||||
if (m.get(CG_ROWTYPE)[0] == 'T' && !app().causale().corrispettivi())
|
||||
if (m.get(CG_ROWTYPE)[0] == cgrowtype_totale && !app().causale().corrispettivi())
|
||||
{
|
||||
const TString4 tipo = app().clifo(); // Tipo conto richiesto dal movimento
|
||||
TString4 cf = m.get(f.dlg()-2);
|
||||
@ -2713,7 +2727,7 @@ void TPrimanota_application::add_cgs_tot(TMask& m)
|
||||
int gruppo = 0, conto = 0;
|
||||
long codice = corri ? 0L : m.get_long(F_CODCLIFOR);
|
||||
TSheet_field& ss = cgs();
|
||||
const int riga_totale = type2pos('T');
|
||||
const int riga_totale = type2pos(cgrowtype_totale);
|
||||
|
||||
// Cerca di preservare il gruppo-conto-sottoconto sulla riga totale
|
||||
if (riga_totale >= 0)
|
||||
@ -2778,7 +2792,7 @@ void TPrimanota_application::add_cgs_tot(TMask& m)
|
||||
{
|
||||
TToken_string& r = ss.row(riga_totale);
|
||||
|
||||
if (row_type(r) == 'T')
|
||||
if (row_type(r) == cgrowtype_totale)
|
||||
{
|
||||
r.rtrim(2);
|
||||
ss.enable_cell(riga_totale, 0);
|
||||
@ -2799,11 +2813,10 @@ void TPrimanota_application::add_cgs_tot(TMask& m)
|
||||
if (descr.blank())
|
||||
descr = m.get(F_DESCR);
|
||||
|
||||
TImporto imp = real2imp(m.get_real(F_TOTALE), 'T');
|
||||
TImporto imp = real2imp(m.get_real(F_TOTALE), cgrowtype_totale);
|
||||
|
||||
set_cgs_row(riga_totale, imp.normalize(), nuovo, descr, 'T');
|
||||
set_cgs_row(riga_totale, imp.normalize(), nuovo, descr, cgrowtype_totale);
|
||||
}
|
||||
|
||||
calcola_imp(); // Ricalcola totale IVA
|
||||
calcola_saldo(); // Ricalcola sbilanci
|
||||
}
|
||||
@ -3045,7 +3058,7 @@ bool TPrimanota_application::main_codiva_handler(TMask_field& f, KEY key)
|
||||
|
||||
const bool corr = a.causale().corrispettivi();
|
||||
const bool acq3 = (acquisto) && (codiva.tipo_indetraibilita() == 3 || row.get_int(2) == 3);
|
||||
const bool reverse_charge_attivo = acquisto && a.causale().reverse_charge() && codiva.reverse_charge_attivo();
|
||||
const bool reverse_charge_attivo = acquisto && a.causale().reverse_charge(); // se la causale e di reverse charge suppongo che il movimento lo sia e quindi metto il flag in ogni caso
|
||||
real tot = a.totale_documento(); // Calcola totale documento
|
||||
real imposta; // Calcola imposta
|
||||
|
||||
@ -3103,7 +3116,7 @@ static void force_iva_det_bill()
|
||||
{
|
||||
const char rtype = row->get_char(cid2index(CG_ROWTYPE));
|
||||
|
||||
if (rtype == 'D')
|
||||
if (rtype == cgrowtype_IVAdet)
|
||||
{
|
||||
row->add(conto.get(0), cid2index(CG_TIPO));
|
||||
row->add(conto.get(), cid2index(CG_GRUPPO));
|
||||
@ -3398,14 +3411,14 @@ void TPrimanota_application::add_cgs_ritenute(char tipo)
|
||||
return;
|
||||
|
||||
TMask& m = curr_mask();
|
||||
const real imp = m.get(tipo=='F' ? F_RITFIS : (tipo=='S' ? F_RITSOC : F_REVCHARGE)); // Determina importo
|
||||
const real imp = m.get(tipo== cgrowtype_ritfis ? F_RITFIS : (tipo== cgrowtype_ritsoc ? F_RITSOC : F_REVCHARGE)); // Determina importo
|
||||
const int pos = type2pos(tipo); // Cerca la riga contabile
|
||||
|
||||
if (pos < 0) // Se non c'e' ...
|
||||
{
|
||||
if (!imp.is_zero()) // ... e l'importo e' valido crea una nuova riga di ritenute
|
||||
{
|
||||
const int riga = tipo=='F' ? RIGA_RITENUTE_FISCALI : (tipo== 'S' ? RIGA_RITENUTE_SOCIALI : RIGA_REVERSE_CHARGE);
|
||||
const int riga = tipo== cgrowtype_ritfis ? RIGA_RITENUTE_FISCALI : (tipo== cgrowtype_ritsoc ? RIGA_RITENUTE_SOCIALI : RIGA_REVERSE_CHARGE);
|
||||
TBill conto; causale().bill(riga, conto);
|
||||
const TString desc = causale().desc_agg(riga);
|
||||
|
||||
@ -3422,7 +3435,7 @@ void TPrimanota_application::add_cgs_ritenute(char tipo)
|
||||
|
||||
if (m.insert_mode())
|
||||
{
|
||||
if (tipo != 'V')
|
||||
if (tipo != cgrowtype_revcharge)
|
||||
{
|
||||
TEdit_field & iva = m.efield(F_CODIVA);
|
||||
|
||||
@ -3467,8 +3480,8 @@ bool TPrimanota_application::protiva_handler(TMask_field& f, KEY key)
|
||||
// Certified 100%
|
||||
bool TPrimanota_application::ritfis_handler(TMask_field& f, KEY key)
|
||||
{
|
||||
if (key == K_TAB && f.focusdirty())
|
||||
app().add_cgs_ritenute('F');
|
||||
if (f.running_check(key))
|
||||
app().add_cgs_ritenute(cgrowtype_ritfis);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -3477,8 +3490,8 @@ bool TPrimanota_application::ritfis_handler(TMask_field& f, KEY key)
|
||||
// Certified 100%
|
||||
bool TPrimanota_application::ritsoc_handler(TMask_field& f, KEY key)
|
||||
{
|
||||
if (key == K_TAB && f.focusdirty())
|
||||
app().add_cgs_ritenute('S');
|
||||
if (f.running_check(key))
|
||||
app().add_cgs_ritenute(cgrowtype_ritsoc);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -3737,10 +3750,10 @@ bool TPrimanota_application::solaiva_handler(TMask_field& f, KEY key)
|
||||
|
||||
cg.reset();
|
||||
a.add_cgs_tot(m); // Genera totale documento
|
||||
if (!m.empty(F_RITFIS)) a.add_cgs_ritenute('F'); // Genera ritenute fiscali
|
||||
if (!m.empty(F_RITSOC)) a.add_cgs_ritenute('S'); // Genera ritenute sociali
|
||||
// if (!m.empty(F_REVCHARGE) && !m.active(F_REVCHARGE))
|
||||
// a.add_cgs_ritenute('V'); // Genera reverse charge
|
||||
if (!m.empty(F_RITFIS))
|
||||
a.add_cgs_ritenute(cgrowtype_ritfis); // Genera ritenute fiscali
|
||||
if (!m.empty(F_RITSOC))
|
||||
a.add_cgs_ritenute(cgrowtype_ritsoc); // Genera ritenute sociali
|
||||
|
||||
TToken_string oldrow(128);
|
||||
|
||||
@ -3956,7 +3969,7 @@ void TPrimanota_application::set_totale(TMask& cg_msk, const shared_ptr<TPro_msk
|
||||
{
|
||||
totale -= rit;
|
||||
cg_msk.set(F_RITFIS, rit);
|
||||
app().add_cgs_ritenute('F');
|
||||
app().add_cgs_ritenute(cgrowtype_ritfis);
|
||||
}
|
||||
else if (msk->is_doc_split())
|
||||
totale = msk->get_tot_imp_riva();
|
||||
|
||||
@ -21,10 +21,6 @@
|
||||
#include "cglib.h"
|
||||
#endif
|
||||
|
||||
#ifndef __CG2101_H
|
||||
#include "cg2101.h"
|
||||
#endif
|
||||
|
||||
#ifndef __CG2100_H
|
||||
#include "cg2100.h"
|
||||
#endif
|
||||
@ -293,7 +289,7 @@ protected:
|
||||
static TipoIVA reg2IVA(const char* registro, int anno);
|
||||
static const real& cod2IVA(const TMask& m);
|
||||
static real scorpora(real& imponibile, const real& percentuale);
|
||||
static int get_importi_iva(const TToken_string& row, real& imp_det, real& iva_det, real& imp_ind, real& iva_ind);
|
||||
static int get_importi_iva(TToken_string & row, real& imp_det, real& iva_det, real& imp_ind, real& iva_ind);
|
||||
static int bill2pos(const TBill& conto, char tipo);
|
||||
|
||||
TipoIVA cau2IVA(const char* causale, int anno);
|
||||
|
||||
@ -1135,10 +1135,10 @@ bool TPrimanota_application::showpartite_handler(TMask_field& f, KEY k)
|
||||
TMask& cm = a.curr_mask();
|
||||
|
||||
const char tipo = m.get(CG_ROWTYPE)[0];
|
||||
const bool is_nota = tipo == 'T' && a.causale().tipomov() == 2 && cm.field(F_NUMRIF).active();
|
||||
const bool is_nota = tipo == cgrowtype_totale && a.causale().tipomov() == 2 && cm.field(F_NUMRIF).active();
|
||||
const bool tras = a._as400 && a.causale().tipomov() > 1 && m.get(CG_TIPO).not_empty();
|
||||
|
||||
if (tipo == 'K' || is_nota || tras)
|
||||
if (tipo == cgrowtype_cliforsc || is_nota || tras)
|
||||
{
|
||||
TSheet_field& s = *m.get_sheet();
|
||||
const int riga = s.selected();
|
||||
@ -1156,9 +1156,9 @@ bool TPrimanota_application::showpartite_handler(TMask_field& f, KEY k)
|
||||
const TImporto importo(a.get_cgs_imp(riga));
|
||||
const TImporto speso(a.partite().importo_speso(curreg, riga+1));
|
||||
|
||||
if (tipo == 'K' && !speso.is_zero())
|
||||
if (tipo == cgrowtype_cliforsc && !speso.is_zero())
|
||||
{
|
||||
a.disable_cgs_cells(riga, 'K');
|
||||
a.disable_cgs_cells(riga, cgrowtype_cliforsc);
|
||||
a.cgs().force_update(riga);
|
||||
}
|
||||
|
||||
@ -1226,7 +1226,7 @@ bool TPrimanota_application::notify_edit_pagamento(TPartita& p, TRectype& new_pa
|
||||
|
||||
if (old_importo != new_importo || old_conto != new_conto)
|
||||
{
|
||||
int old_riga = _easy_sal ? type2pos('I') : bill2pos(old_conto, 'I');
|
||||
int old_riga = _easy_sal ? type2pos(cgrowtype_imponibile) : bill2pos(old_conto, cgrowtype_imponibile);
|
||||
if (old_riga >= 0)
|
||||
{
|
||||
const bool empty = sub_cgs_imp(old_riga, old_importo);
|
||||
@ -1237,23 +1237,27 @@ bool TPrimanota_application::notify_edit_pagamento(TPartita& p, TRectype& new_pa
|
||||
if (!old_importo.is_zero())
|
||||
{
|
||||
TImporto imp = old_importo; imp.swap_section();
|
||||
set_cgs_row(old_riga, imp, old_conto, "", 'I');
|
||||
|
||||
set_cgs_row(old_riga, imp, old_conto, "", cgrowtype_imponibile);
|
||||
}
|
||||
|
||||
// Importo della contropartita
|
||||
if (!new_importo.is_zero() && new_conto.ok())
|
||||
{
|
||||
int new_riga = _easy_sal ? type2pos('I') : bill2pos(new_conto, 'I');
|
||||
int new_riga = _easy_sal ? type2pos(cgrowtype_imponibile) : bill2pos(new_conto, cgrowtype_imponibile);
|
||||
|
||||
if (new_riga < 0)
|
||||
{
|
||||
const int tp = somma.get_int(PART_TIPOPAG);
|
||||
const int da = p.tipopag2causale(tp);
|
||||
const TString descagg(causale().desc_agg(da));
|
||||
new_riga = set_cgs_row(new_riga, new_importo, new_conto, descagg, 'I');
|
||||
|
||||
new_riga = set_cgs_row(new_riga, new_importo, new_conto, descagg, cgrowtype_imponibile);
|
||||
|
||||
TToken_string& cli_row = sheet.row(riga_contabile-1);
|
||||
TBill contro; contro.get(cli_row, 9, 0x3);
|
||||
if (!contro.ok()) // Completa controparita della riga cliente se necessario
|
||||
|
||||
if (!contro.ok()) // Completa controparita della riga cliente se necessario
|
||||
new_conto.add_to(cli_row, 9, 0x3);
|
||||
TString80 descr = cli_row.get(cid2index(CG_DESCR));
|
||||
if (descr.blank()) // Compila descrizione della riga cliente se necessario
|
||||
@ -1276,7 +1280,7 @@ bool TPrimanota_application::notify_edit_pagamento(TPartita& p, TRectype& new_pa
|
||||
TToken_string& new_row = sheet.row(new_riga);
|
||||
new_conto.add_to(new_row, 2, 0x3);
|
||||
// Aggiorna contropartita delle righe cliente
|
||||
FOR_EACH_SHEET_ROW(sheet, r, cli_row) if (row_type(*cli_row) == 'K')
|
||||
FOR_EACH_SHEET_ROW(sheet, r, cli_row) if (row_type(*cli_row) == cgrowtype_cliforsc)
|
||||
new_conto.add_to(*cli_row, 9, 0x3);
|
||||
}
|
||||
}
|
||||
@ -1289,13 +1293,13 @@ bool TPrimanota_application::notify_edit_pagamento(TPartita& p, TRectype& new_pa
|
||||
if (old_ritenute != new_ritenute)
|
||||
{
|
||||
const TImporto grow_ritenute(causale().sezione_ritfis(), new_ritenute - old_ritenute);
|
||||
const int riga = type2pos('F');
|
||||
const int riga = type2pos(cgrowtype_ritfis);
|
||||
|
||||
if (riga < 0)
|
||||
{
|
||||
TBill conto_rit; causale().bill(RIGA_PAG_RITFIS, conto_rit);
|
||||
const TString desc(causale().desc_agg(RIGA_PAG_RITFIS));
|
||||
set_cgs_row(riga, grow_ritenute, conto_rit, desc, 'F');
|
||||
set_cgs_row(riga, grow_ritenute, conto_rit, desc, cgrowtype_ritfis);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -1310,12 +1314,13 @@ bool TPrimanota_application::notify_edit_pagamento(TPartita& p, TRectype& new_pa
|
||||
if (old_ritsoc != new_ritsoc)
|
||||
{
|
||||
const TImporto grow_ritenute(causale().sezione_ritsoc(), new_ritsoc-old_ritsoc);
|
||||
const int riga = type2pos('S');
|
||||
const int riga = type2pos(cgrowtype_ritsoc);
|
||||
|
||||
if (riga < 0)
|
||||
{
|
||||
TBill conto_rit; causale().bill(RIGA_PAG_RITSOC, conto_rit);
|
||||
const TString desc(causale().desc_agg(RIGA_PAG_RITSOC));
|
||||
set_cgs_row(riga, grow_ritenute, conto_rit, desc, 'S');
|
||||
set_cgs_row(riga, grow_ritenute, conto_rit, desc, cgrowtype_ritsoc);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -1378,7 +1383,7 @@ bool TPrimanota_application::notify_edit_pagamento(TPartita& p, TRectype& new_pa
|
||||
// Se c'e' variazione nella differenza cambi
|
||||
if (old_diffcam != new_diffcam)
|
||||
{
|
||||
const int riga_diffcam = type2pos('C');
|
||||
const int riga_diffcam = type2pos(cgrowtype_diffcambio);
|
||||
TImporto grow_diffcam(old_diffcam);
|
||||
grow_diffcam -= new_diffcam;
|
||||
grow_diffcam.normalize();
|
||||
@ -1387,12 +1392,14 @@ bool TPrimanota_application::notify_edit_pagamento(TPartita& p, TRectype& new_pa
|
||||
{
|
||||
TBill conto_diffcam; causale().bill(RIGA_DIFFCAM, conto_diffcam);
|
||||
const TString desc(causale().desc_agg(RIGA_DIFFCAM));
|
||||
set_cgs_row(riga_diffcam, grow_diffcam, conto_diffcam, desc, 'C');
|
||||
|
||||
set_cgs_row(riga_diffcam, grow_diffcam, conto_diffcam, desc, cgrowtype_diffcambio);
|
||||
}
|
||||
else
|
||||
{
|
||||
const bool empty = add_cgs_imp(riga_diffcam, grow_diffcam);
|
||||
if (empty)
|
||||
|
||||
if (empty)
|
||||
sheet.destroy(riga_diffcam);
|
||||
}
|
||||
|
||||
|
||||
@ -937,7 +937,8 @@ bool TGame_mask::partite_notify(TSheet_field& partite, int r, KEY k)
|
||||
if (!riga.is_fattura())
|
||||
continue;
|
||||
|
||||
TToken_string& riga_fattura = gm.add_colored_row(sheet, 'K');
|
||||
TToken_string& riga_fattura = gm.add_colored_row(sheet, cgrowtype_cliforsc);
|
||||
|
||||
riga_fattura.add(ri);
|
||||
riga_fattura.add("");
|
||||
riga_fattura.add(riga.get(PART_DATADOC));
|
||||
@ -958,7 +959,8 @@ bool TGame_mask::partite_notify(TSheet_field& partite, int r, KEY k)
|
||||
{
|
||||
const TRiga_scadenze& scad = riga.rata(ra);
|
||||
|
||||
TToken_string& row = gm.add_colored_row(sheet, 'I');
|
||||
TToken_string& row = gm.add_colored_row(sheet, cgrowtype_imponibile);
|
||||
|
||||
row = riga_fattura;
|
||||
row.add(ra, 1);
|
||||
row.add(scad.get(SCAD_DATASCAD), 3);
|
||||
@ -992,7 +994,8 @@ bool TGame_mask::partite_notify(TSheet_field& partite, int r, KEY k)
|
||||
const int nrig = sum.get_int(PART_NUMRIG);
|
||||
const bool linked = nreg == gm._numreg && nrig == gm._numrig;
|
||||
TToken_string& row = gm.add_colored_row(sheet, linked ? 'X' : ' ');
|
||||
row.add(ri);
|
||||
|
||||
row.add(ri);
|
||||
row.add(ra);
|
||||
row.add(sum.get(PART_DATADOC));
|
||||
row.add(sum.get(PART_DATAPAG));
|
||||
@ -1022,7 +1025,8 @@ bool TGame_mask::partite_notify(TSheet_field& partite, int r, KEY k)
|
||||
|
||||
if (!rit.is_zero())
|
||||
{
|
||||
TToken_string& rrit = gm.add_colored_row(sheet, 'R');
|
||||
TToken_string& rrit = gm.add_colored_row(sheet, cgrowtype_ritfis);
|
||||
|
||||
rrit.add(TR("Ritenute professionali"), 4);
|
||||
gm.add_importo(rrit, rit, FALSE);
|
||||
rrit.add((int)sum.tipo(), 11);
|
||||
@ -1033,7 +1037,7 @@ bool TGame_mask::partite_notify(TSheet_field& partite, int r, KEY k)
|
||||
|
||||
if (!soc.is_zero())
|
||||
{
|
||||
TToken_string& rrit = gm.add_colored_row(sheet, 'R');
|
||||
TToken_string& rrit = gm.add_colored_row(sheet, cgrowtype_ritsoc);
|
||||
|
||||
rrit.add(TR("Ritenute sociali"), 4);
|
||||
gm.add_importo(rrit, soc, FALSE);
|
||||
@ -1083,8 +1087,9 @@ bool TGame_mask::partite_notify(TSheet_field& partite, int r, KEY k)
|
||||
const TImporto diff(sez, pag.get_real(PAGSCA_DIFFCAM));
|
||||
if (!diff.is_zero())
|
||||
{
|
||||
TToken_string& rdiff = gm.add_colored_row(sheet, 'C');
|
||||
rdiff.add(TR("Differenza cambio"), 4);
|
||||
TToken_string& rdiff = gm.add_colored_row(sheet, cgrowtype_diffcambio);
|
||||
|
||||
rdiff.add(TR("Differenza cambio"), 4);
|
||||
if (is_totdoc)
|
||||
gm.add_importo(rdiff, diff);
|
||||
rdiff.add((int)sum.tipo(), 11);
|
||||
@ -1126,6 +1131,7 @@ bool TGame_mask::partite_notify(TSheet_field& partite, int r, KEY k)
|
||||
const int nrig = sum.get_int(PART_NUMRIG);
|
||||
const bool linked = nreg == gm._numreg && nrig == gm._numrig;
|
||||
TToken_string& row = gm.add_colored_row(sheet, linked ? 'X' : ' ');
|
||||
|
||||
row.add(pag.get(PAGSCA_NRIGA));
|
||||
row.add(pag.get(PAGSCA_NRATA));
|
||||
row.add(sum.get(PART_DATADOC));
|
||||
@ -1156,7 +1162,8 @@ bool TGame_mask::partite_notify(TSheet_field& partite, int r, KEY k)
|
||||
const TImporto rit(sez, pag.get_real(PAGSCA_RITENUTE));
|
||||
if (!rit.is_zero())
|
||||
{
|
||||
TToken_string& row = gm.add_colored_row(sheet, 'R');
|
||||
TToken_string& row = gm.add_colored_row(sheet, cgrowtype_ritprof);
|
||||
|
||||
row.add(TR("Ritenute professionali"), 4);
|
||||
gm.add_importo(row, rit, FALSE);
|
||||
row.add((int)sum.tipo(), 11);
|
||||
@ -1166,7 +1173,8 @@ bool TGame_mask::partite_notify(TSheet_field& partite, int r, KEY k)
|
||||
const TImporto soc(sum.sezione_ritsoc(), pag.get_real(PAGSCA_RITSOC));
|
||||
if (!soc.is_zero())
|
||||
{
|
||||
TToken_string& row = gm.add_colored_row(sheet, 'R');
|
||||
TToken_string& row = gm.add_colored_row(sheet, cgrowtype_ritsoc);
|
||||
|
||||
row.add(TR("Ritenute sociali"), 4);
|
||||
gm.add_importo(row, soc, FALSE);
|
||||
row.add((int)sum.tipo(), 11);
|
||||
@ -1188,7 +1196,7 @@ bool TGame_mask::partite_notify(TSheet_field& partite, int r, KEY k)
|
||||
{
|
||||
const char tipo_abb = pag.get_char(PAGSCA_PASSATT);
|
||||
TToken_string& rabb = gm.add_colored_row(sheet, tipo_abb);
|
||||
rabb.add(tipo_abb == 'A' ? TR("Abbuoni attivi") : TR("Abbuoni passivi"), 4);
|
||||
rabb.add(tipo_abb == cgrowtype_abbattivo ? TR("Abbuoni attivi") : TR("Abbuoni passivi"), 4);
|
||||
if (in_valuta)
|
||||
{
|
||||
TImporto abb_lit = abb;
|
||||
@ -1215,7 +1223,8 @@ bool TGame_mask::partite_notify(TSheet_field& partite, int r, KEY k)
|
||||
|
||||
if (lastrow > 0)
|
||||
{
|
||||
TToken_string& sp = gm.add_colored_row(sheet, 'T');
|
||||
TToken_string& sp = gm.add_colored_row(sheet, cgrowtype_totale);
|
||||
|
||||
sp.add(TR("Saldo partita"), 4);
|
||||
if (prima_valuta.in_valuta())
|
||||
sp << ' ' << prima_valuta.codice();
|
||||
@ -1457,7 +1466,7 @@ int TGame_mask::nuovo_pagamento(TPartita& partita, int nriga, int rata, tipo_mov
|
||||
causale.bill(caus = 2, contro); // ... prende il primo
|
||||
if (contro.sottoconto() == 0L)
|
||||
{
|
||||
const int nrow = app().type2pos('I');
|
||||
const int nrow = app().type2pos(cgrowtype_imponibile);
|
||||
|
||||
if (nrow >= 0)
|
||||
{
|
||||
@ -1851,7 +1860,8 @@ void TGame_mask::update_saldo_clifo()
|
||||
append_conto(r);
|
||||
|
||||
COLOR back, fore;
|
||||
app().type2colors('T', back, fore);
|
||||
|
||||
app().type2colors(cgrowtype_totale, back, fore);
|
||||
partite().set_back_and_fore_color(back, fore, i);
|
||||
if (i > 0) // Se ho aggiunto una riga devo decolorare la precedente
|
||||
partite().set_back_and_fore_color(NORMAL_BACK_COLOR, NORMAL_COLOR, i-1);
|
||||
@ -2249,7 +2259,7 @@ bool TPrimanota_application::edit_partite(const TMask& m, int riga)
|
||||
{
|
||||
const char tipo = m.get(CG_TIPO)[0];
|
||||
const char rt = m.get(CG_ROWTYPE)[0];
|
||||
if (rt == 'T' && tipo <= ' ') // Nelle note di credito DEVE essere un clifo
|
||||
if (rt == cgrowtype_totale && tipo <= ' ') // Nelle note di credito DEVE essere un clifo
|
||||
return false;
|
||||
|
||||
const int gruppo = m.get_int(CG_GRUPPO);
|
||||
|
||||
@ -1115,7 +1115,7 @@ void TEasySolder_mask::init(const TBill& conto, long numreg, int numrig)
|
||||
reset(G_TUTTE);
|
||||
|
||||
TBill controbill;
|
||||
const int riga_i = app().type2pos('I');
|
||||
const int riga_i = app().type2pos(cgrowtype_imponibile);
|
||||
if (riga_i >= 0)
|
||||
{
|
||||
TToken_string& row = app().cgs().row(riga_i);
|
||||
|
||||
@ -13,11 +13,11 @@
|
||||
#include "../ca/calib02.h"
|
||||
|
||||
#include "cg2200.h"
|
||||
//#include "cg2101.h"
|
||||
//#include "cglib01.h"
|
||||
//#include "cglib02.h"
|
||||
|
||||
#include "cglib.h"
|
||||
|
||||
|
||||
|
||||
class TProvvisori_msk : public TAutomask
|
||||
{
|
||||
char _provv; // Tipo provvisori da cancellare
|
||||
|
||||
@ -5,8 +5,7 @@
|
||||
#include "cg3.h"
|
||||
#include "cg3100.h"
|
||||
|
||||
#include "cglib01.h"
|
||||
#include "cglib03.h"
|
||||
#include "cglib.h"
|
||||
|
||||
#include <mask.h>
|
||||
#include <modaut.h>
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
#include "cg3.h"
|
||||
#include "cg3200.h"
|
||||
#include "cglib02.h"
|
||||
#include "cglib03.h"
|
||||
#include "cglib.h"
|
||||
|
||||
#include <msksheet.h>
|
||||
#include <printapp.h>
|
||||
@ -3030,12 +3029,12 @@ void TMastrini_application::calcola_progressivi(bool finali)
|
||||
{
|
||||
#ifdef CONT_SEP
|
||||
TDate datalim;
|
||||
const TTipo_data tipo_data = annoes_saldi == 0 ? Registrazione : Competenza ;
|
||||
|
||||
_sld->saldo_cont_sep(_gruppo, _conto, _sottoc, annoes_saldi, esercizi().esercizio(annoes_saldi).fine(), _indbil, _cont_sep, _stampa_mov_prov);
|
||||
_sld->saldo_cont_sep(tipo_data, _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);
|
||||
@ -3068,8 +3067,9 @@ void TMastrini_application::calcola_progressivi(bool finali)
|
||||
|
||||
#ifdef CONT_SEP
|
||||
const int esp = esercizi().pred(_anno_corrente);
|
||||
const TTipo_data tipo_data = esp == 0 ? Registrazione : Competenza;
|
||||
|
||||
_sld->saldo_cont_sep(_gruppo, _conto, _sottoc, esp, esercizi().esercizio(esp).fine(), _indbil, _cont_sep, _stampa_mov_prov, true);
|
||||
_sld->saldo_cont_sep(tipo_data, _gruppo, _conto, _sottoc, esp, esercizi().esercizio(esp).fine(), _indbil, _cont_sep, _stampa_mov_prov, true);
|
||||
saldo = _sld->saldo();
|
||||
#else
|
||||
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
// cg3400 - Stampa libro giornale
|
||||
|
||||
#include "cglib01.h"
|
||||
#include "cglib03.h"
|
||||
#include "cg2103.h"
|
||||
#include "cglib.h"
|
||||
#include "cg3400a.h"
|
||||
#include "cg3400b.h"
|
||||
|
||||
@ -47,8 +45,7 @@ HIDDEN const int SEZA132 = 108;
|
||||
HIDDEN const int TOTAVERE132 = 110;
|
||||
|
||||
enum descr { causale, conto, operazione };
|
||||
enum tipo_sospensione { nessuna, normale, vol_affari, liquidazione };
|
||||
|
||||
enum tipo_sospensione { nessuna, sospensione_normale, vol_affari, liquidazione };
|
||||
|
||||
class TContoOccas : public TBill
|
||||
{
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
|
||||
#include "cg3.h"
|
||||
#include "cg3500.h"
|
||||
#include "cglib02.h"
|
||||
#include "cglib.h"
|
||||
|
||||
typedef enum {stampagruppo, stampaconto, stampasottoconto, fine} tipo;
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#include <xinclude.h>
|
||||
|
||||
#include "cg3.h"
|
||||
#include "cglib02.h"
|
||||
#include "cglib.h"
|
||||
#include "cg3600.h"
|
||||
#include "cg3601.h"
|
||||
|
||||
@ -373,9 +373,10 @@ void TMastrino::read(const TBill& conto,
|
||||
|
||||
#ifdef CONT_SEP
|
||||
TSaldo saldo;
|
||||
int aep = esercizi.pred(ae);
|
||||
const int aep = esercizi.pred(ae);
|
||||
const TTipo_data tipo_data = aep == 0 ? Registrazione : Competenza;
|
||||
|
||||
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);
|
||||
saldo.saldo_cont_sep(tipo_data, _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)
|
||||
{
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
//
|
||||
#include "cg3.h"
|
||||
#include "cg3700a.h"
|
||||
#include "cglib03.h"
|
||||
#include "cglib.h"
|
||||
|
||||
#include <defmask.h>
|
||||
#include <printapp.h>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#include "cg3.h"
|
||||
#include "cg2103.h"
|
||||
#include "cglib.h"
|
||||
#include "cg3900a.h"
|
||||
|
||||
#include <applicat.h>
|
||||
@ -304,8 +304,10 @@ long TPadoaSchioppa_set::new_rec(int tiporec)
|
||||
CHECKD(tiporec == 1 || tiporec == 2, "Tipo record non duplicabile ", tiporec);
|
||||
}
|
||||
CHECKD(tiporec >= 0 && tiporec <= 3 || tiporec == 9, "Tipo record errato ", tiporec);
|
||||
char tr[2] = { '0'+tiporec, '\0' };
|
||||
return TAS400_recordset::new_rec(tr);
|
||||
|
||||
TString4 tr; tr << tiporec;
|
||||
|
||||
return TAS400_recordset::new_rec(tr);
|
||||
}
|
||||
|
||||
void TPadoaSchioppa_set::add_field(int trc, int da, int a, int lung, const char* name,
|
||||
|
||||
@ -9,8 +9,8 @@
|
||||
#include <printapp.h>
|
||||
#endif
|
||||
|
||||
#ifndef __CGLIB03_H
|
||||
#include "cglib03.h"
|
||||
#ifndef __CGLIB_H
|
||||
#include "cglib.h"
|
||||
#endif
|
||||
|
||||
class TProgind;
|
||||
@ -78,7 +78,7 @@ enum recalc { one = 2, never = 4 };
|
||||
enum wht { all = 1, mnt = 2, trimestre = 3};
|
||||
enum tbc { precedente = 1, incorso = 2};
|
||||
enum tiporeg { vendita = 1, acquisto = 2 };
|
||||
enum tipo_sospensione { nessuna, normale, vol_affari, liquidazione };
|
||||
enum tipo_sospensione { nessuna, sospensione_normale, vol_affari, liquidazione };
|
||||
|
||||
// flags per gli items di stampa
|
||||
#define CHG_PARMS 1 // cambiato qualcosa (attivita', ditta...)
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
#include <recarray.h>
|
||||
#include <utility.h>
|
||||
|
||||
#include "cglib03.h"
|
||||
#include "cglib.h"
|
||||
#include "cg4300.h"
|
||||
|
||||
#include <attiv.h>
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
#include "cg4400.h"
|
||||
#include "cg4400a.h"
|
||||
#include "cg4400b.h"
|
||||
#include "cglib01.h"
|
||||
#include "cglib.h"
|
||||
|
||||
#include <defmask.h>
|
||||
#include <execp.h>
|
||||
@ -31,7 +31,7 @@
|
||||
#include <occas.h>
|
||||
#include <unloc.h>
|
||||
|
||||
enum tipo_sospensione { nessuna, normale, vol_affari, liquidazione };
|
||||
enum tipo_sospensione { nessuna, sospensione_normale, vol_affari, liquidazione };
|
||||
|
||||
inline TStampa_registri_app& app() { return (TStampa_registri_app&)main_app(); }
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#include <printapp.h>
|
||||
#include <mask.h>
|
||||
|
||||
#include "cglib03.h"
|
||||
#include "cglib.h"
|
||||
|
||||
enum messaggio {
|
||||
no_liquidazione,
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#include "cg4501.h"
|
||||
#include "cg4500a.h"
|
||||
#include "cglib01.h"
|
||||
#include "cglib.h"
|
||||
|
||||
#include <recarray.h>
|
||||
#include <relation.h>
|
||||
|
||||
@ -7,8 +7,7 @@
|
||||
|
||||
#include "cg4.h"
|
||||
#include "cg4600.h"
|
||||
#include "cg2101.h"
|
||||
#include "cglib02.h"
|
||||
#include "cglib.h"
|
||||
|
||||
#include <pconti.h>
|
||||
#include <mov.h>
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
#include <msksheet.h>
|
||||
#include <prefix.h>
|
||||
#include <tabutil.h>
|
||||
#include "cglib03.h"
|
||||
#include "cglib.h"
|
||||
#include "cg4700.h"
|
||||
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
#include <righef24.h>
|
||||
#include <modaut.h>
|
||||
|
||||
#include "cglib03.h"
|
||||
#include "cglib.h"
|
||||
|
||||
#include "cg4800a.h"
|
||||
#include "cg4800b.h"
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
#include <utility.h>
|
||||
#include <config.h>
|
||||
|
||||
#include "cglib03.h"
|
||||
#include "cglib.h"
|
||||
#include "cg4900.h"
|
||||
|
||||
class LiqAcc_app : public TApplication
|
||||
|
||||
@ -10,10 +10,9 @@
|
||||
#include <mov.h>
|
||||
#include <rmoviva.h>
|
||||
|
||||
#include "cg2101.h"
|
||||
#include "cg2103.h"
|
||||
|
||||
#include "cglib.h"
|
||||
#include "cg4a00a.h"
|
||||
#include "cglib01.h"
|
||||
|
||||
static int __anno;
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
#include <reprint.h>
|
||||
#include <variant.h>
|
||||
|
||||
#include "cglib05.h"
|
||||
#include "cglib.h"
|
||||
#include "cg4b00a.h"
|
||||
|
||||
///////////////////////////////////////////////////////////
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
#include <clifo.h>
|
||||
#include <pconti.h>
|
||||
|
||||
#include "cglib02.h"
|
||||
#include "cglib.h"
|
||||
#include "cg5200.h"
|
||||
|
||||
class TRiga_array : public TArray
|
||||
class TRiga_array_saldi : public TArray
|
||||
{
|
||||
public:
|
||||
bool add_riga(const TRectype& rec_saldi);
|
||||
};
|
||||
|
||||
bool TRiga_array::add_riga(const TRectype& rec_saldi)
|
||||
bool TRiga_array_saldi::add_riga(const TRectype& rec_saldi)
|
||||
{
|
||||
bool flsca, found = false;
|
||||
int annoes, annoesr;
|
||||
@ -109,7 +109,7 @@ class TSaldibrowse_application : public TBrowse_application
|
||||
TMask* _msk;
|
||||
TCursor * _cur;
|
||||
TRelation * _rel,* _rel1;
|
||||
TRiga_array _riga;
|
||||
TRiga_array_saldi _riga;
|
||||
int _anno, _annop, _g, _c;
|
||||
long _s;
|
||||
bool _saldo_conto, _saldo_gruppo, _saldo_sottoc, _scarongly;
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
#include <viswin.h>
|
||||
#include <reputils.h>
|
||||
|
||||
#include "cglib03.h"
|
||||
#include "cglib.h"
|
||||
#include "cg5500.h"
|
||||
#include "cg5500a.h"
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
#include <rmoviva.h>
|
||||
|
||||
#include "cg5700.h"
|
||||
#include "cglib03.h"
|
||||
#include "cglib.h"
|
||||
|
||||
class TDich_periodica_selfirm_mask : public TAutomask
|
||||
{
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
#include <nditte.h>
|
||||
|
||||
#include "cg5800.h"
|
||||
#include "cglib03.h"
|
||||
#include "cglib.h"
|
||||
|
||||
class TQuadro_VT_selfirm_mask : public TAutomask
|
||||
{
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
#include <reprint.h>
|
||||
|
||||
#include "cg5900a.h"
|
||||
#include "cglib03.h"
|
||||
#include "cglib.h"
|
||||
|
||||
#include <attiv.h>
|
||||
#include <causali.h>
|
||||
@ -20,9 +20,8 @@
|
||||
// TProrata_set
|
||||
///////////////////////////////////////////////////////////
|
||||
|
||||
static int _year = 0;
|
||||
static long _attiv = 0;
|
||||
static TAssoc_array _causali;
|
||||
static int __year = 0;
|
||||
static long __attiv = 0;
|
||||
|
||||
static bool prorata_filter(const TRelation* rel)
|
||||
{
|
||||
@ -34,37 +33,31 @@ static bool prorata_filter(const TRelation* rel)
|
||||
if (mov.get_char(MOV_PROVVIS) > ' ') // Solo movimenti definitivi
|
||||
return false;
|
||||
|
||||
if (_year > 0)
|
||||
if (__year > 0)
|
||||
{
|
||||
const int anno = mov.get_int(MOV_ANNOIVA);
|
||||
if (anno != _year)
|
||||
if (anno != __year)
|
||||
return false;
|
||||
}
|
||||
|
||||
const TBill zio(rel->curr());
|
||||
const int cric = zio.tipo_cr();
|
||||
const TCausale & caus = cached_causale(mov.get(MOV_CODCAUS), __year);
|
||||
|
||||
const TString& codcaus = mov.get(MOV_CODCAUS);
|
||||
TCausale* caus = (TCausale*)_causali.objptr(codcaus);
|
||||
if (caus == NULL)
|
||||
if (caus.iva() != iva_acquisti)
|
||||
return false;
|
||||
|
||||
if (caus.intra())
|
||||
return false;
|
||||
|
||||
if (caus.tipodoc() == "AF")
|
||||
return false;
|
||||
|
||||
if (__year > 0 && __attiv > 0)
|
||||
{
|
||||
caus = new TCausale(codcaus, _year);
|
||||
_causali.add(codcaus, caus);
|
||||
}
|
||||
if (caus->iva() != iva_acquisti)
|
||||
return false;
|
||||
|
||||
if (caus->intra())
|
||||
return false;
|
||||
|
||||
if (caus->tipodoc() == "AF")
|
||||
return false;
|
||||
|
||||
if (_year > 0 && _attiv > 0)
|
||||
{
|
||||
const TRegistro& reg = caus->reg();
|
||||
const TRegistro& reg = caus.reg();
|
||||
const long attiv = atol(reg.attivita());
|
||||
if (attiv != _attiv)
|
||||
if (attiv != __attiv)
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -140,12 +133,13 @@ bool TProrata_rep::set_recordset(const TString& sql)
|
||||
{
|
||||
TString query = sql;
|
||||
|
||||
if (_year > 0 && query.find("FROM ") < 0)
|
||||
if (__year > 0 && query.find("FROM ") < 0)
|
||||
{
|
||||
const TDate dal( 1, 1, _year);
|
||||
const TDate al(31, 12, _year);
|
||||
const TDate dal( 1, 1, __year);
|
||||
const TDate al(31, 12, __year);
|
||||
TISAM_recordset mov("USE MOV KEY 2\nFROM DATAREG=#DAL\nTO DATAREG=#AL");
|
||||
mov.set_var("#DAL", dal);
|
||||
|
||||
mov.set_var("#DAL", dal);
|
||||
mov.set_var("#AL", al);
|
||||
|
||||
long danumreg = 0;
|
||||
@ -197,14 +191,14 @@ real TProrata_msk::get_perc_prorata()
|
||||
codtab.format("%05ld%4d%05ld1", f, y, a);
|
||||
const real pr = cache().get("%PLA", codtab, "R8");
|
||||
set(F_PRORATA, pr);
|
||||
_year = y;
|
||||
__year = y;
|
||||
|
||||
TToken_string key; key.format("%05ld", prefix().get_codditta());
|
||||
TRecord_array att(key, LF_ATTIV);
|
||||
if (att.rows() > 1)
|
||||
_attiv = a;
|
||||
__attiv = a;
|
||||
else
|
||||
_attiv = 0;
|
||||
__attiv = 0;
|
||||
return pr;
|
||||
}
|
||||
|
||||
@ -215,12 +209,14 @@ bool TProrata_msk::genera_mov(TFilename& ininame)
|
||||
trans.set("Action", "INSERT");
|
||||
|
||||
const TString& codcaus = get(F_CAUSALE);
|
||||
const TCausale caus(codcaus, _year);
|
||||
const TCausale caus(codcaus, __year);
|
||||
|
||||
trans.set_paragraph("23");
|
||||
trans.set(MOV_CODCAUS, codcaus);
|
||||
trans.set(MOV_DATAREG, TDate(TODAY));
|
||||
TString descr; descr << "PRO-RATA " << _year;
|
||||
|
||||
TString descr; descr << "PRO-RATA " << __year;
|
||||
|
||||
trans.set(MOV_DESCR, descr);
|
||||
|
||||
TProrata_rep rep;
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
#include <mailbox.h>
|
||||
#include <prefix.h>
|
||||
|
||||
#include "cglib04.h"
|
||||
#include "cglib.h"
|
||||
|
||||
class TRic_auto : public TSkeleton_application
|
||||
{
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
#include <nditte.h>
|
||||
|
||||
#include "cg6400.h"
|
||||
#include "cglib04.h"
|
||||
#include "cglib.h"
|
||||
#include "cgsaldac.h"
|
||||
|
||||
class TRic_archivi : public TSkeleton_application
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#include <nditte.h>
|
||||
|
||||
#include "cgtbind.h"
|
||||
#include "cglib04.h"
|
||||
#include "cglib.h"
|
||||
|
||||
class Tabinv_application : public Tab_application
|
||||
{
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
// Ricezione dati da sistema
|
||||
|
||||
#include "cglib02.h"
|
||||
#include "cglib04.h"
|
||||
#include "cglib.h"
|
||||
#include "cgsaldac.h"
|
||||
|
||||
#include "cg6600.h"
|
||||
|
||||
@ -2,9 +2,7 @@
|
||||
// Ricezione dati: lista controllo movimenti
|
||||
//
|
||||
|
||||
#include "cglib01.h"
|
||||
#include "cglib03.h"
|
||||
#include "cglib04.h"
|
||||
#include "cglib.h"
|
||||
#include "cg6700.h"
|
||||
|
||||
#include <mask.h>
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user