diff --git a/build/ce.sln b/build/ce.sln
index d17ba7836..cbd93257a 100644
--- a/build/ce.sln
+++ b/build/ce.sln
@@ -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
diff --git a/build/ce0.vcxproj b/build/ce0.vcxproj
index e7deabdbd..87ad1f3b4 100644
--- a/build/ce0.vcxproj
+++ b/build/ce0.vcxproj
@@ -94,6 +94,7 @@
MachineX86
$(IntDir)
+ false
true
@@ -194,14 +195,6 @@
%(AdditionalIncludeDirectories)
%(PreprocessorDefinitions)
-
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
-
-
-
@@ -409,6 +402,9 @@
{2d38a763-3d74-4338-9362-b891784ec90e}
+
+ {7b80f974-ce2e-4bd9-855a-44ff139ff288}
+
diff --git a/build/ce0.vcxproj.filters b/build/ce0.vcxproj.filters
index 1c7743382..e6279bc55 100644
--- a/build/ce0.vcxproj.filters
+++ b/build/ce0.vcxproj.filters
@@ -65,15 +65,6 @@
Sources
-
- Sources
-
-
- Sources
-
-
- Sources
-
diff --git a/build/ce1.vcxproj b/build/ce1.vcxproj
index 929a59958..a8bf2a1fc 100644
--- a/build/ce1.vcxproj
+++ b/build/ce1.vcxproj
@@ -147,6 +147,7 @@
MachineX86
$(IntDir)
+ false
true
@@ -205,14 +206,6 @@
%(AdditionalIncludeDirectories)
%(PreprocessorDefinitions)
-
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
-
-
-
@@ -241,6 +234,9 @@
{2d38a763-3d74-4338-9362-b891784ec90e}
+
+ {7b80f974-ce2e-4bd9-855a-44ff139ff288}
+
diff --git a/build/ce1.vcxproj.filters b/build/ce1.vcxproj.filters
index ee9220cf8..ef3522877 100644
--- a/build/ce1.vcxproj.filters
+++ b/build/ce1.vcxproj.filters
@@ -38,15 +38,6 @@
Sources
-
- Sources
-
-
- Sources
-
-
- Sources
-
diff --git a/build/ce2.vcxproj b/build/ce2.vcxproj
index 75e1fb9f4..1d48fa54b 100644
--- a/build/ce2.vcxproj
+++ b/build/ce2.vcxproj
@@ -94,6 +94,7 @@
MachineX86
$(IntDir)
+ false
true
@@ -203,14 +204,6 @@
%(AdditionalIncludeDirectories)
%(PreprocessorDefinitions)
-
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
-
-
-
@@ -245,6 +238,9 @@
{2d38a763-3d74-4338-9362-b891784ec90e}
+
+ {7b80f974-ce2e-4bd9-855a-44ff139ff288}
+
diff --git a/build/ce2.vcxproj.filters b/build/ce2.vcxproj.filters
index 4297b6e4e..5aee27c77 100644
--- a/build/ce2.vcxproj.filters
+++ b/build/ce2.vcxproj.filters
@@ -39,15 +39,6 @@
Sources
-
- Sources
-
-
- Sources
-
-
- Sources
-
diff --git a/build/ce3.vcxproj b/build/ce3.vcxproj
index c5e5e3b89..5a9b00ab7 100644
--- a/build/ce3.vcxproj
+++ b/build/ce3.vcxproj
@@ -228,14 +228,6 @@
%(AdditionalIncludeDirectories)
%(PreprocessorDefinitions)
-
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- %(PreprocessorDefinitions)
-
-
-
@@ -378,6 +370,9 @@
{2d38a763-3d74-4338-9362-b891784ec90e}
+
+ {7b80f974-ce2e-4bd9-855a-44ff139ff288}
+
diff --git a/build/ce3.vcxproj.filters b/build/ce3.vcxproj.filters
index d7055d26d..2bbe8d83d 100644
--- a/build/ce3.vcxproj.filters
+++ b/build/ce3.vcxproj.filters
@@ -17,7 +17,7 @@
{05506d07-793c-483a-8422-b5fb02dacf22}
frm
-
+
{e6a64266-c231-455f-82d7-466e432409c5}
rep
@@ -59,15 +59,6 @@
Sources
-
- Sources
-
-
- Sources
-
-
- Sources
-
@@ -141,10 +132,10 @@
- Masks\Reports
+ Reports
- Masks\Reports
+ Reports
diff --git a/build/ce4.vcxproj b/build/ce4.vcxproj
index d5dd26b2c..5e9cc5943 100644
--- a/build/ce4.vcxproj
+++ b/build/ce4.vcxproj
@@ -95,6 +95,7 @@
MachineX86
$(IntDir)
+ false
true
@@ -190,10 +191,6 @@
%(AdditionalIncludeDirectories)
%(PreprocessorDefinitions)
-
-
-
-
@@ -271,6 +268,9 @@
true
false
+
+ {7b80f974-ce2e-4bd9-855a-44ff139ff288}
+
{b61f0ad4-0cce-4371-8e92-85a26caf1a7c}
diff --git a/build/ce4.vcxproj.filters b/build/ce4.vcxproj.filters
index 21f9a5bcb..bad8e3bbd 100644
--- a/build/ce4.vcxproj.filters
+++ b/build/ce4.vcxproj.filters
@@ -47,18 +47,6 @@
Sources
-
- Sources
-
-
- Sources
-
-
- Sources
-
-
- Sources
-
Sources
diff --git a/src/ce/ce0100.cpp b/src/ce/ce0100.cpp
index c25415282..23988ce1f 100755
--- a/src/ce/ce0100.cpp
+++ b/src/ce/ce0100.cpp
@@ -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"
diff --git a/src/ce/ce1300.cpp b/src/ce/ce1300.cpp
index e3364e3ae..6013eb60f 100755
--- a/src/ce/ce1300.cpp
+++ b/src/ce/ce1300.cpp
@@ -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;
}
}
diff --git a/src/ce/ce3100a.frm b/src/ce/ce3100a.frm
index 293f6b06e..f1d9861b0 100755
--- a/src/ce/ce3100a.frm
+++ b/src/ce/ce3100a.frm
@@ -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,8 +1776,8 @@ SECTION FOOTER EVEN 6
GROUP 1
END
-END // section footer even
-//______________________________________________________________________________________________________________-//
+End // section footer even
+// ______________________________________________________________________________________________________________-//
SECTION FOOTER ODD 6
STRINGA -1
diff --git a/src/ce/ce3900.cpp b/src/ce/ce3900.cpp
index b46fae056..9f54743d3 100755
--- a/src/ce/ce3900.cpp
+++ b/src/ce/ce3900.cpp
@@ -2,6 +2,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -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;
diff --git a/src/ce/ce3900.h b/src/ce/ce3900.h
index 6a1e3b4b5..b57e1e51a 100755
--- a/src/ce/ce3900.h
+++ b/src/ce/ce3900.h
@@ -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
diff --git a/src/ce/ce3900.uml b/src/ce/ce3900.uml
index 14c0bd9c2..e9f0a76cf 100755
--- a/src/ce/ce3900.uml
+++ b/src/ce/ce3900.uml
@@ -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
diff --git a/src/ce/ce4100.cpp b/src/ce/ce4100.cpp
index 3873094ce..46d717621 100755
--- a/src/ce/ce4100.cpp
+++ b/src/ce/ce4100.cpp
@@ -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"
diff --git a/src/ce/ce4400.cpp b/src/ce/ce4400.cpp
index 5495fb150..5194a2466 100755
--- a/src/ce/ce4400.cpp
+++ b/src/ce/ce4400.cpp
@@ -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"