From 6d99b66edadf2039da2950122c9d271459cc4b36 Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Thu, 15 Nov 2007 10:13:45 +0000
Subject: [PATCH] Patch level         :4.0 820 Files correlati     :
 Ricompilazione Demo : [ ] Commento            :aggiunti cdc al bilancio di
 commessa e al rendiconto e corretto il funzionamento

git-svn-id: svn://10.65.10.50/trunk@15758 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ca/ca3800b.rep | 29 +----------------------------
 ca/ca3800c.rep | 29 +----------------------------
 ca/ca3883.cpp  | 12 ++++++++----
 3 files changed, 10 insertions(+), 60 deletions(-)

diff --git a/ca/ca3800b.rep b/ca/ca3800b.rep
index 6f9a81061..a26b16079 100755
--- a/ca/ca3800b.rep
+++ b/ca/ca3800b.rep
@@ -117,20 +117,6 @@
    <postscript description="H3.101 POSTSCRIPT">MESSAGE COPY,F3.101</postscript>
   </field>
  </section>
- <section type="Head" level="4" hidden="1">
-  <condition>STAMPAFASI != ""</condition>
-  <groupby>CODCMS</groupby>
-  <font italic="1" face="Arial Narrow" size="8" />
-  <field type="Stringa" width="1" id="1" pattern="1">
-   <source>STAMPAFASI</source>
-  </field>
-  <field x="2" type="Stringa" bg_color="#C0C0C0" width="20" id="2" pattern="1">
-   <source>CODCMS</source>
-  </field>
-  <field x="23" type="Numero" align="right" width="2" id="3" pattern="1">
-   <source>0</source>
-  </field>
- </section>
  <section type="Body" />
  <section type="Body" level="1" hidden="1">
   <prescript description="B1 PRESCRIPT">1 #H4.3  \ incrementa il contatore per il numero di righe di fase
@@ -151,8 +137,7 @@
   </field>
   <field x="91" type="Testo" align="center" width="2" pattern="1" text="%" />
   <field x="59" type="Valuta" align="right" width="13" id="69" pattern="1" text="###.###.###,@@">
-   <postscript description="B1.69 POSTSCRIPT">MESSAGE ADD,F4.69
-MESSAGE ADD,F3.69</postscript>
+   <postscript description="B1.69 POSTSCRIPT">MESSAGE ADD,F3.69</postscript>
   </field>
   <field x="73" type="Valuta" align="right" width="13" id="169" pattern="1" text="###.###.###,@@">
    <source>#RICAVI-#COSTI</source>
@@ -242,17 +227,5 @@ MESSAGE RESET,169</postscript>
 MESSAGE RESET,169</postscript>
   </field>
  </section>
- <section type="Foot" level="4" height="1.25">
-  <condition>(STAMPAFASI != "")&#26;&#26;(#H4.3 &#3E; 0)&#26;&#26;(TIPOSTIMA!='T')&#26;&#26;(FASESPEC=="")</condition>
-  <font italic="1" face="Arial Narrow" size="8" />
-  <field x="22" type="Testo" width="20" pattern="1" text="Totali commessa" />
-  <field x="2" type="Stringa" bg_color="#C0C0C0" width="20" id="2" pattern="1">
-   <source>H4.2</source>
-  </field>
-  <field x="59" type="Valuta" align="right" width="13" id="69" pattern="1" text="###.###.###,@@" />
-  <field x="73" type="Valuta" align="right" width="13" id="169" pattern="1" text="###.###.###,@@">
-   <postscript description="F4.169 POSTSCRIPT">MESSAGE RESET,169</postscript>
-  </field>
- </section>
  <sql>USE SALDANA</sql>
 </report>
\ No newline at end of file
diff --git a/ca/ca3800c.rep b/ca/ca3800c.rep
index 6bfd3e128..895c8c003 100755
--- a/ca/ca3800c.rep
+++ b/ca/ca3800c.rep
@@ -117,20 +117,6 @@
    <postscript description="H3.101 POSTSCRIPT">MESSAGE COPY,F3.101</postscript>
   </field>
  </section>
- <section type="Head" level="4" hidden="1">
-  <condition>STAMPACDC != ""</condition>
-  <groupby>CODCMS</groupby>
-  <font italic="1" face="Arial Narrow" size="8" />
-  <field type="Stringa" width="1" id="1" pattern="1">
-   <source>STAMPACDC</source>
-  </field>
-  <field x="2" type="Stringa" bg_color="#C0C0C0" width="20" id="2" pattern="1">
-   <source>CODCMS</source>
-  </field>
-  <field x="23" type="Numero" align="right" width="2" id="3" pattern="1">
-   <source>0</source>
-  </field>
- </section>
  <section type="Body" />
  <section type="Body" level="1" hidden="1">
   <prescript description="B1 PRESCRIPT">1 #H4.3  \ incrementa il contatore per il numero di righe di cdc
@@ -151,8 +137,7 @@
   </field>
   <field x="91" type="Testo" align="center" width="2" pattern="1" text="%" />
   <field x="59" type="Valuta" align="right" width="13" id="69" pattern="1" text="###.###.###,@@">
-   <postscript description="B1.69 POSTSCRIPT">MESSAGE ADD,F4.69
-MESSAGE ADD,F3.69</postscript>
+   <postscript description="B1.69 POSTSCRIPT">MESSAGE ADD,F3.69</postscript>
   </field>
   <field x="73" type="Valuta" align="right" width="13" id="169" pattern="1" text="###.###.###,@@">
    <source>#RICAVI-#COSTI</source>
@@ -242,17 +227,5 @@ MESSAGE RESET,169</postscript>
 MESSAGE RESET,169</postscript>
   </field>
  </section>
- <section type="Foot" level="4" height="1.25">
-  <condition>(STAMPACDC != "")&#26;&#26;(#H4.3 &#3E; 0)&#26;&#26;(TIPOSTIMA!='T')&#26;&#26;(CDCSPEC=="")</condition>
-  <font italic="1" face="Arial Narrow" size="8" />
-  <field x="22" type="Testo" width="20" pattern="1" text="Totali commessa" />
-  <field x="2" type="Stringa" bg_color="#C0C0C0" width="20" id="2" pattern="1">
-   <source>H4.2</source>
-  </field>
-  <field x="59" type="Valuta" align="right" width="13" id="69" pattern="1" text="###.###.###,@@" />
-  <field x="73" type="Valuta" align="right" width="13" id="169" pattern="1" text="###.###.###,@@">
-   <postscript description="F4.169 POSTSCRIPT">MESSAGE RESET,169</postscript>
-  </field>
- </section>
  <sql>USE SALDANA</sql>
 </report>
\ No newline at end of file
diff --git a/ca/ca3883.cpp b/ca/ca3883.cpp
index 21a879561..75576bb20 100755
--- a/ca/ca3883.cpp
+++ b/ca/ca3883.cpp
@@ -222,9 +222,11 @@ void TCRPA_report::offset_and_fill_columns(TReport_section& rep_sect,
 				new_field->set_field(str_arr.row(i));
 				TString ps = "MESSAGE ADD,F3.";
 				ps << new_field->id();
-        ps << "|ADD,F4.";
-        ps << new_field->id();
-				new_field->set_postscript(ps);
+
+        if (find_section('F', 4) != NULL)
+          ps << "|ADD,F4." << new_field->id();
+				
+        new_field->set_postscript(ps);
 			}
 			break;
 		case 'F':	//i footer devono calcolarsi i totali;ma i footer di totale fasi (4) non devono..
@@ -298,7 +300,7 @@ bool TCRPA_report::generate_columns (TString_array& codici, TString_array& testa
 	}
 
 	//footers
-	for (int i = 4; i > 0; i--)
+	for (int i = find_max_level('F') - 1; i > 0; i--)
 	{
 	  TReport_section& foot = section('F', i);
 
@@ -813,10 +815,12 @@ void TPrint_saldana_recordset::requery()
     switch (_tipostampa)
     {
     case 1:
+    case 4:
       if (_fase.full())
         query << " SELECT FASE=\"" << _fase << "\"";
       break;
     case 2:
+    case 8:
       if (_cdc.full())
         query << " SELECT COSTO=\"" << _cdc << "\"";
       break;