diff --git a/src/ca/ca3600.cpp b/src/ca/ca3600.cpp
index 0ee7b8d0d..50310cc6e 100755
--- a/src/ca/ca3600.cpp
+++ b/src/ca/ca3600.cpp
@@ -1028,6 +1028,7 @@ protected:
virtual void set_dbase_fixed_fields(bool on = true);
public:
+ virtual const char * get_excel_disabled_field() { return "H0.201|H0.202|H0.203"; }
void set_filter(const TPag_per_cms_mask& msk, const int cms_row, const long dacodfor, const long acodfor, const TString& campodata);
};
diff --git a/src/ca/ca3600a.rep b/src/ca/ca3600a.rep
index bbe8781b2..8dfa183ec 100755
--- a/src/ca/ca3600a.rep
+++ b/src/ca/ca3600a.rep
@@ -4,16 +4,6 @@
-
-
- #SYSTEM.RAGSOC
-
-
- #SYSTEM.DATE
-
-
- #REPORT.PAGE
-
@@ -26,6 +16,16 @@
+
+
+ #SYSTEM.RAGSOC
+
+
+ #SYSTEM.DATE
+
+
+ #REPORT.PAGE
+
MESSAGE RESET,F1.101
@@ -229,7 +229,7 @@ MESSAGE ADD,F3.103
#FASE
CA_FORMAT_FASE
-
+
NP
#CONTSEP
diff --git a/src/ca/ca3700.cpp b/src/ca/ca3700.cpp
index 4b8ea1ccf..7fcbba660 100755
--- a/src/ca/ca3700.cpp
+++ b/src/ca/ca3700.cpp
@@ -1996,6 +1996,7 @@ protected:
virtual void set_dbase_fixed_fields(bool on = true);
public:
+ virtual const char * get_excel_disabled_field() { return "H0.201|H0.202|H0.203|H0.204|H0.205|H0.206|H0.207"; }
void set_filter(const TPrint_rendiconto_ca_mask& msk, int cms_row, const int recset_key, TLog_report& log);
};
diff --git a/src/ca/ca3700a.rep b/src/ca/ca3700a.rep
index d32f83b21..2163a4206 100755
--- a/src/ca/ca3700a.rep
+++ b/src/ca/ca3700a.rep
@@ -4,21 +4,6 @@
-
- #SYSTEM.RAGSOC
-
-
-
-
-
- #SYSTEM.DATE
-
-
-
-
-
- #REPORT.PAGE
-
@@ -38,6 +23,21 @@
+
+ #SYSTEM.RAGSOC
+
+
+
+
+
+ #SYSTEM.DATE
+
+
+
+
+
+ #REPORT.PAGE
+
MESSAGE RESET,F1
@@ -301,7 +301,7 @@
#FASE
CA_FORMAT_FASE
-
+
NP
#CONTSEP
diff --git a/src/ca/ca3700b.rep b/src/ca/ca3700b.rep
index 24d2a7537..f217bb906 100644
--- a/src/ca/ca3700b.rep
+++ b/src/ca/ca3700b.rep
@@ -4,33 +4,6 @@
-
- #SYSTEM.RAGSOC
-
-
-
-
-
-
-
-
- #SYSTEM.DATE
-
-
-
- NP
-
-
-
- NP
- #CONTSEP
-
-
-
-
-
- #REPORT.PAGE
-
@@ -54,6 +27,33 @@
+
+ #SYSTEM.RAGSOC
+
+
+
+
+
+
+
+
+ #SYSTEM.DATE
+
+
+
+ NP
+
+
+
+ NP
+ #CONTSEP
+
+
+
+
+
+ #REPORT.PAGE
+
MESSAGE RESET,F1
diff --git a/src/ca/ca3800.cpp b/src/ca/ca3800.cpp
index 232bcaa7b..9b29bcf30 100755
--- a/src/ca/ca3800.cpp
+++ b/src/ca/ca3800.cpp
@@ -165,7 +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"; }
+ virtual const char * get_excel_disabled_field() { return "H0.201|H0.202|H0.203|H0.204|H0.205|H0.121|H0.122|B1.171"; }
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,
@@ -400,9 +400,7 @@ void TPrint_bilancio_cms::execute_print(TReport_book & book, TAutomask & mask, T
else //...senno' stampa standard in un giro solo
{
((TPrint_bilancio_cms_rep &)rep).set_filter(*_mask);
- rep.set_export_sections(type);
- book.add(rep);
- rep.reset_export_sections();
+ book.add(rep, type);
}
}
@@ -438,8 +436,8 @@ TReport & TPrint_bilancio_cms::get_report(const TAutomask & m)
const bool show_cms_descr = m.get_bool(F_SHOW_CMS_DESCR);
const bool show_cms_date = m.get_bool(F_SHOW_CMS_DATE);
- //if (path.empty())
- // path = ((TPrint_bilancio_cms_mask &)m).get_report_class();
+ if (path.empty())
+ path = ((TPrint_bilancio_cms_mask &)m).get_report_class();
//crea il report in base ai parametri (tipo report,struttura,profondita' di stampa)
safe_delete(_rep);
_rep = new TPrint_bilancio_cms_rep(path, prefix, depth, show_fasi, show_cdc, show_cms_descr, show_cms_date, sintetica, intestazione_minima);
@@ -472,8 +470,12 @@ TTrec * TPrint_bilancio_cms::get_dbase_recdesc(TReport & rep, const TAutomask &
desc->add_fielddef("COD", _alfafld, 4);
desc->add_fielddef(cms.rec_des(), COMMESSE_CODCMS);
+ desc->set_name("COMMESSA");
if (show_cms_descr)
+ {
desc->add_fielddef(cms.rec_des(), COMMESSE_DESCRIZ);
+ desc->set_name("TITOLO");
+ }
if (show_cms_date)
{
desc->add_fielddef("INIZIO", _datefld);
@@ -489,13 +491,13 @@ TTrec * TPrint_bilancio_cms::get_dbase_recdesc(TReport & rep, const TAutomask &
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("GENINDIST", _realfld, 18, 2);
desc->add_fielddef("DIPENDENTI", _realfld, 18, 2);
desc->add_fielddef("COSTI", _realfld, 18, 2);
- desc->add_fielddef("DIFFERENZA", _realfld, 18, 2);
- desc->add_fielddef("PERCDIFF", _realfld, 6, 2);
+ desc->add_fielddef("MARGINE", _realfld, 18, 2);
+ desc->add_fielddef("MPCT", _realfld, 6, 2);
- TString keydef = COMMESSE_CODCMS;
+ TString keydef = "COMMESSA";
if (dett_fasi)
keydef << '+' << FASI_CODFASE;
@@ -503,7 +505,7 @@ TTrec * TPrint_bilancio_cms::get_dbase_recdesc(TReport & rep, const TAutomask &
keydef << '+' << CDC_CODCOSTO;
desc->add_keydef(keydef, true);
if (show_cms_descr)
- desc->add_keydef(COMMESSE_DESCRIZ, true);
+ desc->add_keydef("TITOLO", true);
return desc;
}
diff --git a/src/ca/ca3800a.rep b/src/ca/ca3800a.rep
index c54741cfb..08d9190aa 100755
--- a/src/ca/ca3800a.rep
+++ b/src/ca/ca3800a.rep
@@ -6,6 +6,7 @@
+
diff --git a/src/ca/ca3800as.rep b/src/ca/ca3800as.rep
index 0616cbdb9..4340c5d75 100644
--- a/src/ca/ca3800as.rep
+++ b/src/ca/ca3800as.rep
@@ -5,6 +5,7 @@
+
diff --git a/src/ca/ca3800bs.rep b/src/ca/ca3800bs.rep
index df103fd1d..21378d19a 100644
--- a/src/ca/ca3800bs.rep
+++ b/src/ca/ca3800bs.rep
@@ -5,12 +5,6 @@
-
-
-
-
- #REPORT.BOOKPAGE
-
@@ -20,6 +14,12 @@
+
+
+
+
+ #REPORT.BOOKPAGE
+
diff --git a/src/ca/ca3800c.rep b/src/ca/ca3800c.rep
index c4e9334c1..5407c87ef 100755
--- a/src/ca/ca3800c.rep
+++ b/src/ca/ca3800c.rep
@@ -20,14 +20,14 @@
#SYSTEM.DATE
-
-
-
-
- #REPORT.BOOKPAGE
-
+
+
+
+
+ #REPORT.BOOKPAGE
+
diff --git a/src/ca/ca3800cs.rep b/src/ca/ca3800cs.rep
index 6a7b77160..595f85189 100644
--- a/src/ca/ca3800cs.rep
+++ b/src/ca/ca3800cs.rep
@@ -10,18 +10,18 @@
-
-
-
-
- #REPORT.BOOKPAGE
-
"MARGINE CONTRIBUZIONE"
+
+
+
+
+ #REPORT.BOOKPAGE
+
diff --git a/src/ca/ca3900.cpp b/src/ca/ca3900.cpp
index 0ec7a8b85..33af3bda6 100755
--- a/src/ca/ca3900.cpp
+++ b/src/ca/ca3900.cpp
@@ -108,6 +108,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"; }
void set_filter(const TPrint_stima_ricavi_mask& msk);
};
diff --git a/src/ca/ca3900a.rep b/src/ca/ca3900a.rep
index eb25146f6..6c86e921c 100755
--- a/src/ca/ca3900a.rep
+++ b/src/ca/ca3900a.rep
@@ -4,21 +4,6 @@
-
-
-
-
- #SYSTEM.DATE
-
-
- #SYSTEM.RAGSOC
-
-
-
-
-
- #REPORT.PAGE
-
@@ -117,6 +102,21 @@ THEN
+
+
+
+
+ #SYSTEM.RAGSOC
+
+
+ #REPORT.PAGE
+
+
+ #SYSTEM.DATE
+
+
+
+