diff --git a/src/ca/ca3800.cpp b/src/ca/ca3800.cpp
index 203c5ff49..232bcaa7b 100755
--- a/src/ca/ca3800.cpp
+++ b/src/ca/ca3800.cpp
@@ -165,6 +165,7 @@ protected:
virtual bool get_usr_val(const TString& name, TVariant& var) const;
public:
+ virtual const char * get_excel_disabled_field() { return "H0.201|H0.202|H0.203|H0.204|H0.205|H0.121|H0.122"; }
void set_filter(const TPrint_bilancio_cms_mask& msk, const char * curr_fase = "", const char * curr_cdc = "");
TPrint_bilancio_cms_rep(const char* rep_name, const TString& prefix, const int depth,
const bool show_fasi, const bool show_cdc, const bool show_cms_descr, const bool show_cms_date,
@@ -459,11 +460,16 @@ TTrec * TPrint_bilancio_cms::get_dbase_recdesc(TReport & rep, const TAutomask &
TRectype cms(LF_COMMESSE);
TRectype fasi(LF_FASI);
TRectype cdc(LF_CDC);
+
const int tipostampa = mask.get_int(F_TIPOSTAMPA);
const bool show_cms_descr = mask.get_bool(F_SHOW_CMS_DESCR);
const bool show_cms_date = mask.get_bool(F_SHOW_CMS_DATE);
const bool dett_fasi = (tipostampa == 1) || (tipostampa == 3);
const bool dett_cdc = (tipostampa == 2) || (tipostampa == 3);
+ const bool sintetica = mask.get_bool(F_STAMPA_SINTETICA);
+
+ if (sintetica)
+ desc->add_fielddef("COD", _alfafld, 4);
desc->add_fielddef(cms.rec_des(), COMMESSE_CODCMS);
if (show_cms_descr)
@@ -477,17 +483,17 @@ TTrec * TPrint_bilancio_cms::get_dbase_recdesc(TReport & rep, const TAutomask &
desc->add_fielddef(fasi.rec_des(), FASI_CODFASE);
if (dett_cdc)
desc->add_fielddef(cdc.rec_des(), CDC_CODCOSTO);
- desc->add_fielddef("AVRIC", _realfld, 6, 2);
+ desc->add_fielddef("PERCAV", _realfld, 6, 2);
desc->add_fielddef("RICAVI", _realfld, 18, 2);
- desc->add_fielddef("INCAR", _realfld, 18, 2);
- desc->add_fielddef("CONSUL", _realfld, 18, 2);
- desc->add_fielddef("ALTRI", _realfld, 18, 2);
- desc->add_fielddef("MATER", _realfld, 18, 2);
- desc->add_fielddef("INDIST", _realfld, 18, 2);
- desc->add_fielddef("DIPEND", _realfld, 18, 2);
+ desc->add_fielddef("INCARICHI", _realfld, 18, 2);
+ desc->add_fielddef("CONSULENZE", _realfld, 18, 2);
+ desc->add_fielddef("ALTRICOSTI", _realfld, 18, 2);
+ desc->add_fielddef("MATERIALI", _realfld, 18, 2);
+ desc->add_fielddef("GENERALI", _realfld, 18, 2);
+ desc->add_fielddef("DIPENDENTI", _realfld, 18, 2);
desc->add_fielddef("COSTI", _realfld, 18, 2);
- desc->add_fielddef("DIFF", _realfld, 18, 2);
- desc->add_fielddef("DIFFPERC", _realfld, 6, 2);
+ desc->add_fielddef("DIFFERENZA", _realfld, 18, 2);
+ desc->add_fielddef("PERCDIFF", _realfld, 6, 2);
TString keydef = COMMESSE_CODCMS;
diff --git a/src/ca/ca3800a.rep b/src/ca/ca3800a.rep
index 2a9924350..c54741cfb 100755
--- a/src/ca/ca3800a.rep
+++ b/src/ca/ca3800a.rep
@@ -4,38 +4,37 @@
-
- #SYSTEM.RAGSOC
-
-
-
-
-
- #SYSTEM.DATE
-
-
-
-
-
- #REPORT.BOOKPAGE
-
+
-
+
TIPOSTIMA
-
-
-
+
+
+
-
-
- "MARGINE CONTRIBUZIONE"
+
+
+
+ #SYSTEM.RAGSOC
+
+
+
+
+
+ #SYSTEM.DATE
+
+
+
+
+
+ #REPORT.BOOKPAGE
diff --git a/src/ca/ca3800as.rep b/src/ca/ca3800as.rep
index 80e3f68c7..0616cbdb9 100644
--- a/src/ca/ca3800as.rep
+++ b/src/ca/ca3800as.rep
@@ -4,6 +4,7 @@
+
@@ -11,23 +12,21 @@
TIPOSTIMA
-
-
-
+
+
+
+
-
+
+
+
-
+
#REPORT.BOOKPAGE
-
-
-
- "MARGINE CONTRIBUZIONE"
-
diff --git a/src/ca/ca3800b.rep b/src/ca/ca3800b.rep
index 845c5f8f4..791c4b57d 100755
--- a/src/ca/ca3800b.rep
+++ b/src/ca/ca3800b.rep
@@ -4,30 +4,29 @@
-
- #SYSTEM.RAGSOC
-
-
-
-
-
- #SYSTEM.DATE
-
-
-
-
-
- #REPORT.BOOKPAGE
-
FASESPEC
-
-
-
- "MARGINE CONTRIBUZIONE"
+
+
+
+
+
+ #SYSTEM.RAGSOC
+
+
+
+
+
+ #SYSTEM.DATE
+
+
+
+
+
+ #REPORT.BOOKPAGE
diff --git a/src/ca/ca3800bs.rep b/src/ca/ca3800bs.rep
index 77ad5f5dd..df103fd1d 100644
--- a/src/ca/ca3800bs.rep
+++ b/src/ca/ca3800bs.rep
@@ -4,10 +4,6 @@
-
-
- FASESPEC
-
@@ -16,11 +12,14 @@
#REPORT.BOOKPAGE
-
+
-
- "MARGINE CONTRIBUZIONE"
+
+
+ FASESPEC
+
+
diff --git a/src/ca/ca3800c.rep b/src/ca/ca3800c.rep
index e828bc073..c4e9334c1 100755
--- a/src/ca/ca3800c.rep
+++ b/src/ca/ca3800c.rep
@@ -4,31 +4,30 @@
-
- #SYSTEM.RAGSOC
-
-
-
-
-
- #SYSTEM.DATE
-
-
-
-
-
- #REPORT.BOOKPAGE
-
CDCSPEC
+
-
-
-
- "MARGINE CONTRIBUZIONE"
+
+ #SYSTEM.RAGSOC
+
+
+
+
+ #SYSTEM.DATE
+
+
+
+
+
+
+ #REPORT.BOOKPAGE
+
+
+
diff --git a/src/ca/ca3800cs.rep b/src/ca/ca3800cs.rep
index e4eb63c22..6a7b77160 100644
--- a/src/ca/ca3800cs.rep
+++ b/src/ca/ca3800cs.rep
@@ -8,6 +8,7 @@
CDCSPEC
+
@@ -16,9 +17,9 @@
#REPORT.BOOKPAGE
-
+
-
+
"MARGINE CONTRIBUZIONE"
diff --git a/src/ca/ca3801.cpp b/src/ca/ca3801.cpp
index 40a049cc0..f5a7e679d 100755
--- a/src/ca/ca3801.cpp
+++ b/src/ca/ca3801.cpp
@@ -434,8 +434,8 @@ TCRPA_report::TCRPA_report (const char* rep_name, const TString& prefix, const i
generate_columns (codici, testate, 69, show_fasi, show_cdc, show_cms_descr, show_cms_date, sintetica);
if (intestazione_minima)
{
- section('H', 0).find_field(100)->hide();
- section('H', 0).find_field(101)->hide();
+ section('H', 0).find_field(204)->hide();
+ section('H', 0).find_field(205)->hide();
}
}