From ad39bae6e4c730639ee4047333d7b737a8b0ad10 Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Tue, 3 Jul 2007 14:50:38 +0000
Subject: [PATCH] Patch level         :4.0 740 Files correlati     :ca3 & co.
 Ricompilazione Demo : [ ] Commento            :sistemato report di bilancio
 annuale commessa in modo umano (totali per commessa resi piu' intelligenti)

git-svn-id: svn://10.65.10.50/trunk@15470 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ca/ca3800a.rep | 29 ++++++++++++++++++-----------
 ca/ca3883.cpp  |  5 +++++
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/ca/ca3800a.rep b/ca/ca3800a.rep
index e56a68513..d6b61987f 100755
--- a/ca/ca3800a.rep
+++ b/ca/ca3800a.rep
@@ -24,17 +24,17 @@
   <field border="1" radius="100" x="1" type="Testo" valign="center" align="center" shade_offset="25" width="167" height="2.5" text="BILANCIO DI COMMESSA PER ESERCIZIO">
    <font face="Courier New" bold="1" size="16" />
   </field>
-  <field x="2" y="3" type="Testo" width="35" pattern="1" text="Costi e ricavi di Commessa maturati nell'esercizio">
+  <field x="10" y="3" type="Testo" width="35" pattern="1" text="Costi e ricavi di Commessa maturati nell'esercizio">
    <font italic="1" face="Arial Narrow" size="9" />
   </field>
-  <field x="40" y="3" type="Stringa" width="4" pattern="1">
+  <field x="45" y="3" type="Stringa" width="4" pattern="1">
    <font face="Arial Narrow" bold="1" size="9" />
    <source>ANNO</source>
   </field>
-  <field x="49" y="3" type="Testo" width="15" pattern="1" text="Stima avanzamento ">
+  <field x="60" y="3" type="Testo" width="15" pattern="1" text="Stima avanzamento ">
    <font italic="1" face="Arial Narrow" size="9" />
   </field>
-  <field x="64" y="3" type="Array" width="30" pattern="1">
+  <field x="75" y="3" type="Array" width="30" pattern="1">
    <font face="Arial Narrow" bold="1" size="9" />
    <source>TIPOSTIMA</source>
    <list>
@@ -43,10 +43,10 @@
     <li Value="COSTI Consuntivi \ RICAVI Consuntivi" Code="R" />
    </list>
   </field>
-  <field x="99" y="3" type="Testo" width="25" pattern="1" text="Profondita' della struttura in esame">
+  <field x="120" y="3" type="Testo" width="25" pattern="1" text="Profondita' della struttura in esame">
    <font italic="1" face="Arial Narrow" size="9" />
   </field>
-  <field x="125" y="3" type="Array" width="7" pattern="1">
+  <field x="145" y="3" type="Array" width="7" pattern="1">
    <font face="Arial Narrow" bold="1" size="9" />
    <source>DEPTH</source>
    <list>
@@ -54,14 +54,21 @@
     <li Value="Conto" Code="2" />
    </list>
   </field>
-  <field x="138" y="3" type="Testo" width="20" pattern="1" text="Include esercizi successivi">
+  <field x="10" y="4.25" type="Testo" width="20" pattern="1" text="Include esercizi successivi">
    <font italic="1" face="Arial Narrow" size="9" />
   </field>
-  <field x="159" y="3" type="Stringa" width="3" pattern="1">
+  <field x="30" y="4.25" type="Stringa" width="3" pattern="1">
    <font face="Arial Narrow" bold="1" size="9" />
    <source>VITAINTERA</source>
   </field>
-  <field border="2" x="1" y="4.5" type="Linea" width="169" height="0" pattern="1" />
+  <field x="60" y="4.25" type="Testo" width="15" pattern="1" text="Fase specificata">
+   <font italic="1" face="Arial Narrow" size="9" />
+  </field>
+  <field x="75" y="4.25" type="Stringa" width="10" pattern="1">
+   <font face="Arial Narrow" bold="1" size="9" />
+   <source>FASESPEC</source>
+  </field>
+  <field border="2" x="1" y="5.5" type="Linea" width="169" height="0" pattern="1" />
  </section>
  <section type="Head" level="2" height="1.5" page_break="1">
   <groupby>LEVEL &#3C; 2</groupby>
@@ -132,7 +139,7 @@
    <font face="Arial Narrow" size="7" />
    <source>IF(#H4.3=0;DESCRIZ;"")</source>
   </field>
-  <field x="46" type="Stringa" width="10" pattern="1">
+  <field x="47" type="Stringa" width="9" pattern="1">
    <source>FASE</source>
   </field>
   <field x="56" type="Numero" align="right" width="3" pattern="1">
@@ -227,7 +234,7 @@ THEN
   </field>
  </section>
  <section type="Foot" level="4" height="1.25">
-  <condition>(STAMPAFASI != "")&#26;&#26;(#H4.3 &#3E; 1)</condition>
+  <condition>(STAMPAFASI != "")&#26;&#26;(#H4.3 &#3E; 0)&#26;&#26;(TIPOSTIMA!='T')&#26;&#26;(FASESPEC=="")</condition>
   <font italic="1" face="Arial Narrow" bold="1" size="8" />
   <field border="1" x="2" type="Linea" width="169" height="0" pattern="1" />
   <field x="22" type="Testo" width="20" pattern="1" text="Totali commessa" />
diff --git a/ca/ca3883.cpp b/ca/ca3883.cpp
index c1cf26a7b..18db7d2ed 100755
--- a/ca/ca3883.cpp
+++ b/ca/ca3883.cpp
@@ -835,6 +835,11 @@ const TVariant& TPrint_saldana_recordset::get(const char* column_name) const
       var.set(_use_fasi  == true ? "X" : "");
 		}
 		else
+		if (strcmp(column_name, "FASESPEC") == 0)
+		{
+			var.set(_fase);
+		}
+		else
 		if (strcmp(column_name, "AVANZAMENTO") == 0)
 		{
 			//Calcola lo stato di avanzamento della commessa