From c9414444133535ffaab3c4938ccbc2115dbf2bc5 Mon Sep 17 00:00:00 2001
From: Alessandro Bonazzi <alexbonazzi5652@gmail.com>
Date: Sat, 8 Jan 2022 10:55:59 +0100
Subject: [PATCH] Patch level         : 12.0 1101 Files correlati     : ca3.exe
 ca3100.uml ca3100a.rep ca3100b.rep ca3200.uml ca3200a.rep                    
   ca3200b.rep ca3300.uml ca3300a.rep ca3300b.rep                      
 ca3300c.rep ca3300d.rep ca3600.uml ca3600a.rep                      
 ca3700.uml ca3700a.rep ca3700b.rep ca3800.uml                      
 ca3800a.rep ca3800as.rep ca3800b.rep ca3800bs.rep                      
 ca3800c.rep ca3800cs.rep ca3883.cpp ca3900.uml                      
 ca3900a.rep Commento :

modificato il meccanismo per lanciare le stampe in batch.
Sintassi: ca3 -7 -b <nome del file che contiene i valori dell maschera> (-T) <tipo di output <P>rint|<E>xport|E<X>cel|PD<F>|<T>esto|<D>Base|<V>isualizza> (-O) <nome del file di output (-F) <codice ditta> (-S) <separatore per excel)

Esempio: ca3 -7 -b select.sav X c:\out\rend

esporta il rendiconto di commessa usando i parametri salvati in select.sav nel file c:\out\rend.xls
---
 src/ca/ca3800.cpp   | 24 +++++++++++++++---------
 src/ca/ca3800a.rep  | 43 +++++++++++++++++++++----------------------
 src/ca/ca3800as.rep | 19 +++++++++----------
 src/ca/ca3800b.rep  | 37 ++++++++++++++++++-------------------
 src/ca/ca3800bs.rep | 13 ++++++-------
 src/ca/ca3800c.rep  | 37 ++++++++++++++++++-------------------
 src/ca/ca3800cs.rep |  5 +++--
 src/ca/ca3801.cpp   |  4 ++--
 8 files changed, 92 insertions(+), 90 deletions(-)

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 @@
  <font face="Arial Narrow" size="7" />
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="" hidden="" page_break="" can_break="" pattern="1">
   <font italic="1" face="Arial Narrow" bold="1" size="7" />
-  <field x="1" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="50" codval="" id="" pattern="1" hide_zero="" text="">
-   <source>#SYSTEM.RAGSOC</source>
-  </field>
-  <field x="60" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="10" codval="" id="" pattern="1" hide_zero="" text="Data stampa">
-   <font italic="1" face="Arial Narrow" size="7" />
-  </field>
-  <field x="70" deactivated="" type="Data" hidden="" link="" dynamic_height="" shade_offset="" width="12" codval="" id="" pattern="1" hide_zero="" text="">
-   <source>#SYSTEM.DATE</source>
-  </field>
-  <field x="120" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="4" codval="" id="" pattern="1" hide_zero="" text="Pag.">
-   <font italic="1" face="Arial Narrow" size="7" />
-  </field>
-  <field x="124" deactivated="" type="Numero" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="3" codval="" id="" pattern="1" hide_zero="" text="">
-   <source>#REPORT.BOOKPAGE</source>
-  </field>
   <field border="1" x="1" y="3" deactivated="" type="Linea" hidden="" link="" dynamic_height="" shade_offset="" width="195" codval="" height="0" id="" pattern="1" hide_zero="" text="" />
+  <field x="1" y="2" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="1" pattern="1" hide_zero="" text="Commessa" />
   <field x="41" y="2" deactivated="" type="Testo" hidden="" align="center" link="" dynamic_height="" shade_offset="" width="6" codval="" id="3" pattern="1" hide_zero="" text="Inizio" />
   <field x="46.5" y="2" deactivated="" type="Testo" hidden="" align="center" link="" dynamic_height="" shade_offset="" width="6" codval="" id="4" pattern="1" hide_zero="" text="Fine" />
   <field x="51" y="2" deactivated="" type="Testo" hidden="" align="center" link="" dynamic_height="" shade_offset="" width="6" codval="" id="5" pattern="1" hide_zero="" text="Fase" />
   <field x="58.5" y="2" deactivated="" type="Testo" hidden="" align="center" link="" dynamic_height="" shade_offset="" width="6" codval="" id="6" pattern="1" hide_zero="" text="CdC" />
-  <field x="64" y="2" deactivated="" type="Array" hidden="" align="center" link="" dynamic_height="" shade_offset="" width="7" codval="" id="7" pattern="1" hide_zero="" text="">
+  <field x="64" y="2" deactivated="" type="Array" hidden="" align="center" link="" dynamic_height="" shade_offset="" width="8" codval="" id="7" pattern="1" hide_zero="" text="">
    <source>TIPOSTIMA</source>
    <list>
-    <li Value="% Av." Code="T" />
-    <li Value="% Ric." Code="C" />
-    <li Value="% Ric." Code="R" />
+    <li Value="Perc Av" Code="T" />
+    <li Value="Perc Ric" Code="C" />
+    <li Value="Perc Ric" Code="R" />
    </list>
   </field>
   <field x="69" y="2" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="13" codval="" id="69" pattern="1" hide_zero="" text="Testata" />
-  <field x="1" y="2" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="121" pattern="1" hide_zero="" text="Commessa" />
-  <field x="83" y="1" deactivated="" type="Stringa" valign="bottom" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="13" codval="" height="2" id="169" pattern="1" hide_zero="" text="">
-   <source>"MARGINE CONTRIBUZIONE"</source>
+  <field x="83" y="2" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="13" codval="" id="169" pattern="1" hide_zero="" text="MARGINE" />
+  <field x="96" y="2" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="4" codval="" id="170" pattern="1" hide_zero="" text="Perc" />
+  <field x="1" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="50" codval="" id="201" pattern="1" hide_zero="" text="">
+   <source>#SYSTEM.RAGSOC</source>
+  </field>
+  <field x="60" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="10" codval="" id="202" pattern="1" hide_zero="" text="Data stampa">
+   <font italic="1" face="Arial Narrow" size="7" />
+  </field>
+  <field x="70" deactivated="" type="Data" hidden="" link="" dynamic_height="" shade_offset="" width="12" codval="" id="203" pattern="1" hide_zero="" text="">
+   <source>#SYSTEM.DATE</source>
+  </field>
+  <field x="120" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="4" codval="" id="204" pattern="1" hide_zero="" text="Pag.">
+   <font italic="1" face="Arial Narrow" size="7" />
+  </field>
+  <field x="124" deactivated="" type="Numero" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="3" codval="" id="205" pattern="1" hide_zero="" text="">
+   <source>#REPORT.BOOKPAGE</source>
   </field>
  </section>
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="1" hidden="" page_break="" can_break="" pattern="1">
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 @@
  <font face="Arial Narrow" size="7" />
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="" hidden="" page_break="" can_break="" pattern="1">
   <font italic="1" face="Arial Narrow" bold="1" size="7" />
+  <field x="5" y="1" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="1" pattern="1" hide_zero="" text="Commessa" />
   <field x="45" y="1" deactivated="" type="Testo" hidden="" align="center" link="" dynamic_height="" shade_offset="" width="6" codval="" id="3" pattern="1" hide_zero="" text="Inizio" />
   <field x="50.5" y="1" deactivated="" type="Testo" hidden="" align="center" link="" dynamic_height="" shade_offset="" width="6" codval="" id="4" pattern="1" hide_zero="" text="Fine" />
   <field x="55" y="1" deactivated="" type="Testo" hidden="" align="center" link="" dynamic_height="" shade_offset="" width="6" codval="" id="5" pattern="1" hide_zero="" text="Fase" />
@@ -11,23 +12,21 @@
   <field x="68" y="1" deactivated="" type="Array" hidden="" align="center" link="" dynamic_height="" shade_offset="" width="7" codval="" id="7" pattern="1" hide_zero="" text="">
    <source>TIPOSTIMA</source>
    <list>
-    <li Value="% Av." Code="T" />
-    <li Value="% Ric." Code="C" />
-    <li Value="% Ric." Code="R" />
+    <li Value="Perc Av" Code="T" />
+    <li Value="Perc Ric" Code="C" />
+    <li Value="Perc Ric" Code="R" />
    </list>
   </field>
+  <field x="1" y="1" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="4" codval="" id="10" pattern="1" hide_zero="" text="Cod" />
   <field x="73" y="1" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="13" codval="" id="69" pattern="1" hide_zero="" text="Testata" />
-  <field x="163" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="4" codval="" id="100" pattern="1" hide_zero="" text="Pag.">
+  <field x="87" y="1" deactivated="" type="Stringa" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="13" codval="" id="169" pattern="1" hide_zero="" text="MARGINE" />
+  <field x="100" y="1" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="4" codval="" id="170" pattern="1" hide_zero="" text="Perc" />
+  <field x="163" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="4" codval="" id="204" pattern="1" hide_zero="" text="Pag.">
    <font italic="1" face="Arial Narrow" size="7" />
   </field>
-  <field x="167" deactivated="" type="Numero" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="3" codval="" id="101" pattern="1" hide_zero="" text="">
+  <field x="167" deactivated="" type="Numero" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="3" codval="" id="205" pattern="1" hide_zero="" text="">
    <source>#REPORT.BOOKPAGE</source>
   </field>
-  <field x="1" y="1" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="4" codval="" id="121" pattern="1" hide_zero="" text="Cod." />
-  <field x="5" y="1" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="121" pattern="1" hide_zero="" text="Commessa" />
-  <field x="87" deactivated="" type="Stringa" valign="bottom" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="13" codval="" height="2" id="169" pattern="1" hide_zero="" text="">
-   <source>"MARGINE CONTRIBUZIONE"</source>
-  </field>
  </section>
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="1" hidden="" height="5" page_break="" can_break="" pattern="1">
   <field x="1" deactivated="" type="Testo" hidden="" align="center" link="" dynamic_height="" shade_offset="" width="169" codval="" id="" pattern="1" hide_zero="" text="BILANCIO DI COMMESSA PER ESERCIZIO">
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 @@
  <font face="Arial Narrow" size="8" />
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="" hidden="" page_break="" can_break="" pattern="1">
   <font italic="1" face="Arial Narrow" bold="1" size="8" />
-  <field x="1" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="50" codval="" id="" pattern="1" hide_zero="" text="">
-   <source>#SYSTEM.RAGSOC</source>
-  </field>
-  <field x="60" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="10" codval="" id="" pattern="1" hide_zero="" text="Data stampa">
-   <font italic="1" face="Arial Narrow" size="8" />
-  </field>
-  <field x="70" deactivated="" type="Data" hidden="" link="" dynamic_height="" shade_offset="" width="12" codval="" id="" pattern="1" hide_zero="" text="">
-   <source>#SYSTEM.DATE</source>
-  </field>
-  <field x="120" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="4" codval="" id="" pattern="1" hide_zero="" text="Pag.">
-   <font italic="1" face="Arial Narrow" size="8" />
-  </field>
-  <field x="124" deactivated="" type="Numero" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="3" codval="" id="" pattern="1" hide_zero="" text="">
-   <source>#REPORT.BOOKPAGE</source>
-  </field>
   <field x="10" y="2" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="12" codval="" id="" pattern="1" hide_zero="" text="">
    <font face="Arial" bold="1" size="10" />
    <source>FASESPEC</source>
   </field>
   <field border="1" x="1" y="3" deactivated="" type="Linea" hidden="" link="" dynamic_height="" shade_offset="" width="169" codval="" height="0" id="" pattern="1" hide_zero="" text="" />
-  <field x="35" y="1" deactivated="" type="Testo" valign="bottom" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="13" codval="" height="2" id="69" pattern="1" hide_zero="" text="Testata" />
-  <field x="1" y="2" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="8" codval="" id="121" pattern="1" hide_zero="" text="Fase" />
-  <field x="50" y="1" deactivated="" type="Stringa" hidden="" align="center" link="" dynamic_height="" shade_offset="" width="13" codval="" height="2" id="169" pattern="1" hide_zero="" text="">
-   <source>"MARGINE CONTRIBUZIONE"</source>
+  <field x="1" y="2" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="8" codval="" id="1" pattern="1" hide_zero="" text="Fase" />
+  <field x="35" y="2" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="13" codval="" id="69" pattern="1" hide_zero="" text="Testata" />
+  <field x="50" y="2" deactivated="" type="Stringa" hidden="" align="center" link="" dynamic_height="" shade_offset="" width="13" codval="" id="169" pattern="1" hide_zero="" text="MARGINE" />
+  <field x="63" y="2" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="4" codval="" id="170" pattern="1" hide_zero="" text="Perc" />
+  <field x="1" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="50" codval="" id="201" pattern="1" hide_zero="" text="">
+   <source>#SYSTEM.RAGSOC</source>
+  </field>
+  <field x="60" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="10" codval="" id="202" pattern="1" hide_zero="" text="Data stampa">
+   <font italic="1" face="Arial Narrow" size="8" />
+  </field>
+  <field x="70" deactivated="" type="Data" hidden="" link="" dynamic_height="" shade_offset="" width="12" codval="" id="203" pattern="1" hide_zero="" text="">
+   <source>#SYSTEM.DATE</source>
+  </field>
+  <field x="120" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="4" codval="" id="204" pattern="1" hide_zero="" text="Pag.">
+   <font italic="1" face="Arial Narrow" size="8" />
+  </field>
+  <field x="124" deactivated="" type="Numero" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="3" codval="" id="205" pattern="1" hide_zero="" text="">
+   <source>#REPORT.BOOKPAGE</source>
   </field>
  </section>
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="1" hidden="" page_break="" can_break="" pattern="1">
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 @@
  <font face="Arial Narrow" size="8" />
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="" hidden="" page_break="" can_break="" pattern="1">
   <font italic="1" face="Arial Narrow" bold="1" size="8" />
-  <field x="17" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="12" codval="" id="" pattern="1" hide_zero="" text="">
-   <font face="Arial" bold="1" size="10" />
-   <source>FASESPEC</source>
-  </field>
   <field x="39" deactivated="" type="Testo" valign="bottom" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="13" codval="" height="2" id="69" pattern="1" hide_zero="" text="Testata" />
   <field x="163" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="4" codval="" id="100" pattern="1" hide_zero="" text="Pag.">
    <font italic="1" face="Arial Narrow" size="8" />
@@ -16,11 +12,14 @@
    <source>#REPORT.BOOKPAGE</source>
   </field>
   <field x="6" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="8" codval="" id="121" pattern="1" hide_zero="" text="Fase" />
-  <field x="1" y="1" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="4" codval="" id="121" pattern="1" hide_zero="" text="Cod." />
+  <field x="1" y="1" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="4" codval="" id="121" pattern="1" hide_zero="" text="Cod" />
   <field x="6" y="1" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="8" codval="" id="121" pattern="1" hide_zero="" text="Commessa" />
-  <field x="54" deactivated="" type="Stringa" hidden="" align="center" link="" dynamic_height="" shade_offset="" width="13" codval="" height="2" id="169" pattern="1" hide_zero="" text="">
-   <source>"MARGINE CONTRIBUZIONE"</source>
+  <field x="17" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="12" codval="" id="122" pattern="1" hide_zero="" text="">
+   <font face="Arial" bold="1" size="10" />
+   <source>FASESPEC</source>
   </field>
+  <field x="54" y="1" deactivated="" type="Stringa" hidden="" align="center" link="" dynamic_height="" shade_offset="" width="13" codval="" id="169" pattern="1" hide_zero="" text="MARGINE" />
+  <field x="67" y="1" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="4" codval="" id="169" pattern="1" hide_zero="" text="Perc" />
  </section>
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="1" hidden="" page_break="" can_break="" pattern="1">
   <field deactivated="" type="Testo" hidden="" align="center" link="" dynamic_height="" shade_offset="" width="169" codval="" id="" pattern="1" hide_zero="" text="BILANCIO DI COMMESSA PER ESERCIZIO RAGGRUPPATO PER FASE">
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 @@
  <font face="Arial Narrow" size="8" />
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="" hidden="" page_break="" can_break="" pattern="1">
   <font italic="1" face="Arial Narrow" bold="1" size="8" />
-  <field x="1" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="50" codval="" id="" pattern="1" hide_zero="" text="">
-   <source>#SYSTEM.RAGSOC</source>
-  </field>
-  <field x="60" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="10" codval="" id="" pattern="1" hide_zero="" text="Data stampa">
-   <font italic="1" face="Arial Narrow" size="8" />
-  </field>
-  <field x="70" deactivated="" type="Data" hidden="" link="" dynamic_height="" shade_offset="" width="12" codval="" id="" pattern="1" hide_zero="" text="">
-   <source>#SYSTEM.DATE</source>
-  </field>
-  <field x="120" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="4" codval="" id="" pattern="1" hide_zero="" text="Pag.">
-   <font italic="1" face="Arial Narrow" size="8" />
-  </field>
-  <field x="123" deactivated="" type="Numero" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="3" codval="" id="" pattern="1" hide_zero="" text="">
-   <source>#REPORT.BOOKPAGE</source>
-  </field>
   <field x="17.5" y="2" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="12" codval="" id="" pattern="1" hide_zero="" text="">
    <font face="Arial" bold="1" size="10" />
    <source>CDCSPEC</source>
   </field>
+  <field x="64" y="2" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="4" codval="" id="" pattern="1" hide_zero="" text="Perc" />
   <field border="1" x="1" y="3" deactivated="" type="Linea" hidden="" link="" dynamic_height="" shade_offset="" width="169" codval="" height="0" id="" pattern="1" hide_zero="" text="" />
-  <field x="35" y="1" deactivated="" type="Testo" valign="bottom" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="13" codval="" height="2" id="69" pattern="1" hide_zero="" text="Testata" />
-  <field x="1" y="2" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="14" codval="" id="121" pattern="1" hide_zero="" text="Centro di costo" />
-  <field x="51" y="1" deactivated="" type="Stringa" valign="bottom" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="13" codval="" height="2" id="169" pattern="1" hide_zero="" text="">
-   <source>"MARGINE CONTRIBUZIONE"</source>
+  <field x="1" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="50" codval="" id="1" pattern="1" hide_zero="" text="">
+   <source>#SYSTEM.RAGSOC</source>
   </field>
+  <field x="60" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="10" codval="" id="2" pattern="1" hide_zero="" text="Data stampa">
+   <font italic="1" face="Arial Narrow" size="8" />
+  </field>
+  <field x="70" deactivated="" type="Data" hidden="" link="" dynamic_height="" shade_offset="" width="12" codval="" id="3" pattern="1" hide_zero="" text="">
+   <source>#SYSTEM.DATE</source>
+  </field>
+  <field x="35" y="2" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="13" codval="" id="69" pattern="1" hide_zero="" text="Testata" />
+  <field x="120" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="4" codval="" id="100" pattern="1" hide_zero="" text="Pag.">
+   <font italic="1" face="Arial Narrow" size="8" />
+  </field>
+  <field x="123" deactivated="" type="Numero" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="3" codval="" id="101" pattern="1" hide_zero="" text="">
+   <source>#REPORT.BOOKPAGE</source>
+  </field>
+  <field x="1" y="2" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="14" codval="" id="121" pattern="1" hide_zero="" text="Centro di costo" />
+  <field x="51" y="2" deactivated="" type="Stringa" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="13" codval="" id="169" pattern="1" hide_zero="" text="MARGINE" />
  </section>
  <section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="1" hidden="" page_break="" can_break="" pattern="1">
   <field border="1" radius="100" x="1" deactivated="" type="Testo" valign="center" hidden="" align="center" link="" dynamic_height="" shade_offset="25" width="169" codval="" height="2.5" id="" pattern="2" hide_zero="" text="BILANCIO DI COMMESSA PER ESERCIZIO RAGGRUPPATO PER CENTRI DI COSTO">
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 @@
    <font face="Arial" bold="1" size="10" />
    <source>CDCSPEC</source>
   </field>
+  <field x="68" y="1" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="4" codval="" id="" pattern="1" hide_zero="" text="Perc" />
   <field x="39" deactivated="" type="Testo" valign="bottom" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="13" codval="" height="2" id="69" pattern="1" hide_zero="" text="Testata" />
   <field x="164" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="4" codval="" id="100" pattern="1" hide_zero="" text="Pag.">
    <font italic="1" face="Arial Narrow" size="8" />
@@ -16,9 +17,9 @@
    <source>#REPORT.BOOKPAGE</source>
   </field>
   <field x="6" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="14" codval="" id="121" pattern="1" hide_zero="" text="Centro di costo" />
-  <field x="1" y="1" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="4" codval="" id="121" pattern="1" hide_zero="" text="Cod." />
+  <field x="1" y="1" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="4" codval="" id="121" pattern="1" hide_zero="" text="Cod" />
   <field x="6" y="1" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="14" codval="" id="121" pattern="1" hide_zero="" text="Commessa" />
-  <field x="55" deactivated="" type="Stringa" valign="bottom" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="13" codval="" height="2" id="169" pattern="1" hide_zero="" text="">
+  <field x="55" y="1" deactivated="" type="Stringa" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="13" codval="" id="169" pattern="1" hide_zero="" text="">
    <source>"MARGINE CONTRIBUZIONE"</source>
   </field>
  </section>
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();
 	}
 
 }