Patch level : 12.0 1026

Files correlati     : ce3.exe ce3900.msk
Commento            :

La stampa del registro cespiti sintetico permette ora di fare il calcolo ammortamenti prima della stampa
This commit is contained in:
Alessandro Bonazzi 2020-12-30 02:21:04 +01:00
parent b73823580b
commit f8467abf77
19 changed files with 68 additions and 109 deletions

View File

@ -21,6 +21,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedocext", "vedocext.vcxpro
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lilib", "lilib.vcxproj", "{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cglib", "cglib.vcxproj", "{7B80F974-CE2E-4BD9-855A-44FF139FF288}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@ -63,6 +65,10 @@ Global
{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
{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.ActiveCfg = Debug|Win32
{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.Build.0 = Debug|Win32
{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.ActiveCfg = Release|Win32
{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

View File

@ -94,6 +94,7 @@
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ProfileGuidedDatabase>$(IntDir)</ProfileGuidedDatabase>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
@ -194,14 +195,6 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\cg\cglib01.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\cglib03.cpp" />
<ClCompile Include="..\src\cg\cgsaldac.cpp" />
</ItemGroup>
<ItemGroup>
<MskCompiler Include="..\src\ce\ce0400a.uml" />
@ -409,6 +402,9 @@
<ProjectReference Include="AgaLib.vcxproj">
<Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
</ProjectReference>
<ProjectReference Include="cglib.vcxproj">
<Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

View File

@ -65,15 +65,6 @@
<ClCompile Include="..\src\ce\celib.cpp">
<Filter>Sources</Filter>
</ClCompile>
<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">

View File

@ -147,6 +147,7 @@
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ProfileGuidedDatabase>$(IntDir)</ProfileGuidedDatabase>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
@ -205,14 +206,6 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\cg\cglib01.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\cglib03.cpp" />
<ClCompile Include="..\src\cg\cgsaldac.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\ce\ce1.h" />
@ -241,6 +234,9 @@
<ProjectReference Include="AgaLib.vcxproj">
<Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
</ProjectReference>
<ProjectReference Include="cglib.vcxproj">
<Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<MskCompiler Include="..\src\ce\ce1101a.uml" />

View File

@ -38,15 +38,6 @@
<ClCompile Include="..\src\ce\celib.cpp">
<Filter>Sources</Filter>
</ClCompile>
<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">

View File

@ -94,6 +94,7 @@
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ProfileGuidedDatabase>$(IntDir)</ProfileGuidedDatabase>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
@ -203,14 +204,6 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\cg\cglib01.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\cglib03.cpp" />
<ClCompile Include="..\src\cg\cgsaldac.cpp" />
</ItemGroup>
<ItemGroup>
<MskCompiler Include="..\src\ce\ce2100a.uml" />
@ -245,6 +238,9 @@
<ProjectReference Include="AgaLib.vcxproj">
<Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
</ProjectReference>
<ProjectReference Include="cglib.vcxproj">
<Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

View File

@ -39,15 +39,6 @@
<ClCompile Include="..\src\ce\celib.cpp">
<Filter>Sources</Filter>
</ClCompile>
<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">

View File

@ -228,14 +228,6 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\cg\cglib01.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\cglib03.cpp" />
<ClCompile Include="..\src\cg\cgsaldac.cpp" />
</ItemGroup>
<ItemGroup>
<MskCompiler Include="..\src\ce\ce3100a.uml" />
@ -378,6 +370,9 @@
<ProjectReference Include="AgaLib.vcxproj">
<Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
</ProjectReference>
<ProjectReference Include="cglib.vcxproj">
<Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

View File

@ -17,7 +17,7 @@
<UniqueIdentifier>{05506d07-793c-483a-8422-b5fb02dacf22}</UniqueIdentifier>
<Extensions>frm</Extensions>
</Filter>
<Filter Include="Masks\Reports">
<Filter Include="Reports">
<UniqueIdentifier>{e6a64266-c231-455f-82d7-466e432409c5}</UniqueIdentifier>
<Extensions>rep</Extensions>
</Filter>
@ -59,15 +59,6 @@
<ClCompile Include="..\src\ce\celib.cpp">
<Filter>Sources</Filter>
</ClCompile>
<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">
@ -141,10 +132,10 @@
</ItemGroup>
<ItemGroup>
<RepCompiler Include="..\src\ce\ce3900a.rep">
<Filter>Masks\Reports</Filter>
<Filter>Reports</Filter>
</RepCompiler>
<RepCompiler Include="..\src\ce\ce3900b.rep">
<Filter>Masks\Reports</Filter>
<Filter>Reports</Filter>
</RepCompiler>
</ItemGroup>
<ItemGroup>

View File

@ -95,6 +95,7 @@
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<ProfileGuidedDatabase>$(IntDir)</ProfileGuidedDatabase>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
@ -190,10 +191,6 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\cg\cglib01.cpp" />
<ClCompile Include="..\src\cg\cglib02.cpp" />
<ClCompile Include="..\src\cg\cglib03.cpp" />
<ClCompile Include="..\src\cg\cgsaldac.cpp" />
</ItemGroup>
<ItemGroup>
<MskCompiler Include="..\src\ce\ce4100a.uml" />
@ -271,6 +268,9 @@
<LinkLibraryDependencies>true</LinkLibraryDependencies>
<UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
</ProjectReference>
<ProjectReference Include="cglib.vcxproj">
<Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
</ProjectReference>
<ProjectReference Include="lilib.vcxproj">
<Project>{b61f0ad4-0cce-4371-8e92-85a26caf1a7c}</Project>
</ProjectReference>

View File

@ -47,18 +47,6 @@
<ClCompile Include="..\src\ce\celib.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\cg\cglib01.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cgsaldac.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\ce\ce2101.cpp">
<Filter>Sources</Filter>
</ClCompile>

View File

@ -12,7 +12,7 @@
#include "../ca/commesse.h"
#include "../ca/fasi.h"
#include "../cg/cglib01.h"
#include "../cg/cglib.h"
#include "ce0.h"
#include "celib.h"

View File

@ -253,7 +253,7 @@ bool TSelam_qmask::on_field_event(TOperable_field& o, TField_event e, long jolly
real valore = salce.get_real(SALCE_CSTO)-salce.get_real(SALCE_VNONAMM)+salce.get_real(SALCE_RIV75)+salce.get_real(SALCE_RIV83)+salce.get_real(SALCE_RIV90)+salce.get_real(SALCE_RIV91)+salce.get_real(SALCE_RIVGF);
real valoreuni = valore / salce.get_int(SALCE_NUMELE);
if (valoreuni <= _uniprice)
_ammo100 = TRUE;
_ammo100 = true;
}
}
}
@ -262,7 +262,7 @@ bool TSelam_qmask::on_field_event(TOperable_field& o, TField_event e, long jolly
real valore = salce.get_real(SALCE_CSTO)-salce.get_real(SALCE_VNONAMM)+salce.get_real(SALCE_RIV75)+salce.get_real(SALCE_RIV83)+salce.get_real(SALCE_RIV90)+salce.get_real(SALCE_RIV91)+salce.get_real(SALCE_RIVGF);
real valoreuni = valore / salce.get_int(SALCE_NUMELE);
if (valoreuni <= _uniprice)
_ammo100 = TRUE;
_ammo100 = true;
}
}

View File

@ -238,9 +238,9 @@ SECTION HEADER FIRST 9
PROMPT 1 9 "@b___________________________________________________________________________________________________________________________________________________@r"
END
END // end section header first (INTESTAZIONE REGISTRO VERA E PROPRIA)
End // End section header first (INTESTAZIONE REGISTRO VERA E PROPRIA)
////
//
SECTION HEADER EVEN 2
STRINGA -1
@ -283,9 +283,9 @@ SECTION HEADER EVEN 2
MESSAGE _DESCAT,H2->FR_GRUPPO,H2->FR_SPECIE,FR_CAT
END
END // section header even (INTESTAZIONE CATEGORIA)
End // section header even (INTESTAZIONE CATEGORIA)
////
//
SECTION HEADER ODD 3
@ -842,9 +842,9 @@ SECTION BODY FIRST 9
PICTURE "##.###.###.###.@@@"
END
END // section body first (MOVIMENTI)
End // section body first (MOVIMENTI)
////
//
SECTION BODY ODD 3
@ -935,9 +935,9 @@ SECTION BODY ODD 3
PROMPT 106 3 ""
MESSAGE _NUMEXPR,#FR_MV_FONDOAMM+#FR_MV_QNOR+#FR_MV_QACC+#FR_MV_QANT
PICTURE "##.###.###.###.@@@"
END
End
///!!!!
//!!!!
VALUTA FR_MV_MINUSVALENZA 18
BEGIN
@ -980,9 +980,9 @@ SECTION BODY ODD 3
PICTURE "##.###.###.###.@@@"
END
END // section body odd (TOTALE MOVIMENTO)
End // section body odd (TOTALE MOVIMENTO)
////
//
//Body che stampa ogni movimento/rettifica//
SECTION BODY EVEN 17
@ -1518,9 +1518,9 @@ SECTION BODY EVEN 17
PROMPT 142 17 "totale"
END
END // section body even (VALORI A FINE ESERCIZIO)
End // section body even (VALORI A FINE ESERCIZIO)
////
//
SECTION FOOTER EVEN 6
@ -1776,7 +1776,7 @@ SECTION FOOTER EVEN 6
GROUP 1
END
END // section footer even
End // section footer even
// ______________________________________________________________________________________________________________-//
SECTION FOOTER ODD 6

View File

@ -2,6 +2,7 @@
#include <automask.h>
#include <defmask.h>
#include <dongle.h>
#include <execp.h>
#include <modaut.h>
#include <progind.h>
#include <recarray.h>
@ -381,8 +382,20 @@ protected:
void TStampa_sintetica::main_loop()
{
TStampa_sintetica_mask mask;
mask.set(F_CALCOLO, "X");
while (mask.run() == K_ENTER)
{
// Esecuzione calcolo globale
if (mask.get_bool(F_CALCOLO))
{
const int es = mask.get_int(F_ESERCIZIO);
const int gr = mask.get_int(F_GRUPPO);
const TString& sp = mask.get(F_SPECIE);
ditta_cespiti().set_attivita(es, gr, sp); // Fissa attività per calcolo
TExternal_app cal("ce2 -0 A");
cal.run(); // Esegue programma di calcolo in batch
}
//report e book dei report
TReport_book book;
TStampa_sintetica_rep rep;

View File

@ -17,6 +17,7 @@
#define F_GROUP_CODIMP 117
#define F_GROUP_CODLOC 118
#define F_EXCLUDE_ALIENS 119
#define F_CALCOLO 120
/*#define F_CODCMS 120
#define F_DESCMS 121

View File

@ -156,9 +156,14 @@ BEGIN
PROMPT 42 14 "Escludere i cespiti alienati"
END
BOOLEAN F_CALCOLO
BEGIN
PROMPT 2 16 "Esegui calcolo ammortamenti prima di stampare"
END
RADIOBUTTON F_SORT 78
BEGIN
PROMPT 1 16 "@bOrdinamento"
PROMPT 1 17 "@bOrdinamento"
ITEM "2|Categoria+Cespite" MESSAGE ENABLE,F_BREAK
ITEM "0|Cespite" MESSAGE CLEAR,F_BREAK
ITEM "3|Categoria+Completamento" MESSAGE ENABLE,F_BREAK
@ -168,7 +173,7 @@ END
BOOLEAN F_BREAK
BEGIN
PROMPT 2 19 "@bSalto pagina per categoria"
PROMPT 2 20 "@bSalto pagina per categoria"
FLAGS "Z"
END

View File

@ -7,7 +7,7 @@
#include "../ca/commesse.h"
#include "../ca/calib01.h"
#include "../cg/cglib01.h"
#include "../cg/cglib.h"
#include "celib.h"
#include "salcecms.h"

View File

@ -12,8 +12,7 @@
#include "../ca/movana.h"
#include "../ca/rmovana.h"
#include "../cg/cg2101.h"
#include "../cg/cglib02.h"
#include "../cg/cglib.h"
#include "celib.h"
#include "ce2101.h"