Patch level :10.0

Files correlati     :
Ricompilazione Demo : [ ]
Commento            :modifiche ai report delle stampe di analitica secondo richieste enrichetta


git-svn-id: svn://10.65.10.50/trunk@16533 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2008-04-21 13:17:08 +00:00
parent 9f30662d0d
commit d3dc6833fd
6 changed files with 136 additions and 33 deletions

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<report libraries="ve1300" name="ca3700a" orientation="2" lpi="9" class="ca3700a">
<description>Rendiconto CA</description>
<font face="Courier New" size="8" />
@ -8,10 +8,16 @@
<font italic="1" face="Courier New" bold="1" size="9" />
<source>#SYSTEM.RAGSOC</source>
</field>
<field x="70" type="Testo" width="10" pattern="1" text="Data stampa">
<font italic="1" face="Courier New" size="8" />
</field>
<field x="80" type="Data" width="10" pattern="1">
<source>#SYSTEM.DATE</source>
</field>
<field x="165" type="Numero" align="right" width="3" pattern="1">
<field x="157" type="Testo" width="4" pattern="1" text="Pag.">
<font italic="1" face="Courier New" size="8" />
</field>
<field x="161" type="Numero" align="right" width="3" pattern="1">
<source>#REPORT.PAGE</source>
</field>
<field border="2" x="1" y="2" type="Linea" width="169" height="0" pattern="1" />
@ -268,7 +274,27 @@ MESSAGE RESET,F2.900</prescript>
<source>NUMRD</source>
</field>
</section>
<section type="Foot" />
<section type="Foot">
<field border="1" x="1" y="0.25" type="Linea" width="169" height="0" pattern="1" />
<field x="1" y="0.75" type="Testo" width="10" pattern="1" text="Commessa" />
<field x="11" y="0.75" type="Stringa" width="20" pattern="1">
<font face="Courier New" bold="1" size="8" />
<source>#COMMESSA</source>
<prescript description="F0.0 PRESCRIPT">CA_FORMAT_COMMESSA</prescript>
</field>
<field x="33" y="0.75" type="Testo" width="18" pattern="1" text="Centro di Costo:" />
<field x="51" y="0.75" type="Stringa" width="18" pattern="1">
<font face="Courier New" bold="1" size="8" />
<source>#COSTO</source>
<prescript description="F0.0 PRESCRIPT">CA_FORMAT_COSTO</prescript>
</field>
<field x="71" y="0.75" type="Testo" width="5" pattern="1" text="Fase:" />
<field x="77" y="0.75" type="Stringa" width="13" pattern="1">
<font face="Courier New" bold="1" size="8" />
<source>#FASE</source>
<prescript description="F0.0 PRESCRIPT">CA_FORMAT_FASE</prescript>
</field>
</section>
<section type="Foot" level="1">
<field border="2" x="1" y="0.5" type="Linea" width="169" height="0" pattern="1" />
<field x="90" y="1" type="Testo" width="15" pattern="1" text="ATTIVITA'">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<report libraries="ve1300" name="ca3800a" orientation="2" lpi="6" class="ca3800a">
<description>Bilancio commessa CA</description>
<font face="Arial Narrow" size="8" />
@ -7,17 +7,23 @@
<field x="1" type="Stringa" width="50" pattern="1">
<source>#SYSTEM.RAGSOC</source>
</field>
<field x="80" type="Data" width="12" pattern="1">
<field x="54" type="Testo" width="10" pattern="1" text="Data stampa">
<font italic="1" face="Arial Narrow" size="8" />
</field>
<field x="64" type="Data" width="12" pattern="1">
<source>#SYSTEM.DATE</source>
</field>
<field x="165" type="Numero" align="right" width="3" pattern="1">
<field x="83" type="Testo" width="4" pattern="1" text="Pag.">
<font italic="1" face="Arial Narrow" size="8" />
</field>
<field x="87" type="Numero" align="right" width="3" pattern="1">
<source>#REPORT.PAGE</source>
</field>
<field x="86" y="1.25" type="Testo" align="center" width="13" pattern="1" text="Margine" />
<field x="85" y="1.25" type="Testo" align="center" width="13" pattern="1" text="Margine" />
<field x="46.5" y="2" type="Testo" align="center" width="6" pattern="1" text="Fase" />
<field x="54.5" y="2" type="Testo" align="center" width="6" pattern="1" text="CdC" />
<field x="60" y="2" type="Testo" align="center" width="6" pattern="1" text="% Av." />
<field x="86" y="2" type="Testo" align="center" width="13" pattern="1" text=" Contribuz. " />
<field x="85" y="2" type="Testo" align="center" width="13" pattern="1" text=" Contribuz. " />
<field border="1" x="1" y="3" type="Linea" width="169" height="0" pattern="1" />
<field x="65" y="2" type="Testo" align="right" width="13" id="69" pattern="1" text="Testata" />
<field x="1" y="2" type="Testo" width="15" id="121" pattern="1" text="Commessa" />
@ -149,15 +155,29 @@
</field>
<field x="47" type="Stringa" width="9" pattern="1">
<source>FASE</source>
<prescript description="B1.0 PRESCRIPT">#STAMPAFASI @
EMPTY= IF
#THIS HIDE
ELSE
#THIS SHOW
THEN
</prescript>
</field>
<field x="57" type="Stringa" width="5" pattern="1">
<source>CDC</source>
<prescript description="B1.0 PRESCRIPT">#STAMPACDC @
EMPTY= IF
#THIS HIDE
ELSE
#THIS SHOW
THEN
</prescript>
</field>
<field x="62" type="Numero" align="right" width="3" pattern="1">
<font italic="1" face="Arial Narrow" size="8" />
<source>ROUND(AVANZAMENTO;0)</source>
</field>
<field x="97" type="Testo" align="center" width="2" pattern="1" text="%" />
<field x="96" type="Testo" align="center" width="2" pattern="1" text="%" />
<field x="65" 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>
@ -167,7 +187,7 @@ MESSAGE ADD,F3.69</postscript>
<postscript description="B1.169 POSTSCRIPT">MESSAGE ADD,F4.169
MESSAGE ADD,F3.169</postscript>
</field>
<field x="93" type="Numero" align="right" width="4" id="170" pattern="1">
<field x="92" type="Numero" align="right" width="4" id="170" pattern="1">
<font italic="1" face="Arial Narrow" size="8" />
<prescript description="B1.170 PRESCRIPT">#RICAVI @
EMPTY= IF
@ -186,7 +206,16 @@ THEN
#THIS !</prescript>
</field>
</section>
<section type="Foot" />
<section type="Foot">
<field border="1" x="1" y="0.25" type="Linea" width="169" height="0" pattern="1" />
<field x="2" y="0.75" type="Testo" width="25" pattern="1" text="Bilancio di commessa per esercizio">
<font italic="1" face="Arial Narrow" bold="1" size="8" />
</field>
<field x="28.5" y="0.75" type="Stringa" width="5" pattern="1">
<font face="Arial Narrow" bold="1" size="9" />
<source>ANNO</source>
</field>
</section>
<section type="Foot" level="1" height="3">
<font italic="1" face="Arial Narrow" bold="1" size="8" />
<field border="2" x="1" y="0.75" type="Linea" width="169" height="0" pattern="1" />

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<report libraries="ve1300" name="ca3800b" orientation="2" lpi="6" class="ca3800b">
<description>Bilancio commessa CA per fasi</description>
<font face="Arial Narrow" size="8" />
@ -7,10 +7,16 @@
<field x="1" type="Stringa" width="50" pattern="1">
<source>#SYSTEM.RAGSOC</source>
</field>
<field x="80" type="Data" width="12" pattern="1">
<field x="53" type="Testo" width="10" pattern="1" text="Data stampa">
<font italic="1" face="Arial Narrow" size="8" />
</field>
<field x="63" type="Data" width="12" pattern="1">
<source>#SYSTEM.DATE</source>
</field>
<field x="165" type="Numero" align="right" width="3" pattern="1">
<field x="76" type="Testo" width="4" pattern="1" text="Pag.">
<font italic="1" face="Arial Narrow" size="8" />
</field>
<field x="80" type="Numero" align="right" width="3" pattern="1">
<source>#REPORT.PAGE</source>
</field>
<field x="80" y="1.25" type="Testo" align="center" width="13" pattern="1" text="Margine" />
@ -31,10 +37,6 @@
<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="45" y="3" type="Stringa" width="4" pattern="1">
<font face="Arial Narrow" bold="1" size="9" />
<source>ANNO</source>
</field>
<field x="60" y="3" type="Testo" width="15" pattern="1" text="Stima avanzamento ">
<font italic="1" face="Arial Narrow" size="9" />
</field>
@ -74,6 +76,10 @@
<source>FASESPEC</source>
<postscript description="H1.1 POSTSCRIPT">MESSAGE COPY,F1.1</postscript>
</field>
<field x="45" y="3" type="Stringa" width="4" id="2" pattern="1">
<font face="Arial Narrow" bold="1" size="9" />
<source>ANNO</source>
</field>
</section>
<section type="Head" level="2" height="1.5">
<groupby>LEVEL &#3C; 2</groupby>
@ -163,7 +169,16 @@ THEN
#THIS !</prescript>
</field>
</section>
<section type="Foot" />
<section type="Foot">
<field border="1" x="1" y="0.25" type="Linea" width="169" height="0" pattern="1" />
<field x="2" y="0.75" type="Testo" width="25" pattern="1" text="Bilancio di commessa per esercizio">
<font italic="1" face="Arial Narrow" bold="1" size="8" />
</field>
<field x="28.5" y="0.75" type="Stringa" width="5" pattern="1">
<font face="Arial Narrow" bold="1" size="9" />
<source>H1.2</source>
</field>
</section>
<section type="Foot" level="1" height="3">
<font italic="1" face="Arial Narrow" bold="1" size="8" />
<field border="2" x="1" y="0.5" type="Linea" width="169" height="0" pattern="1" />

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<report libraries="ve1300" name="ca3800c" orientation="2" lpi="6" class="ca3800c">
<description>Bilancio commessa CA per CdC</description>
<font face="Arial Narrow" size="8" />
@ -7,10 +7,16 @@
<field x="1" type="Stringa" width="50" pattern="1">
<source>#SYSTEM.RAGSOC</source>
</field>
<field x="80" type="Data" width="12" pattern="1">
<field x="53" type="Testo" width="10" pattern="1" text="Data stampa">
<font italic="1" face="Arial Narrow" size="8" />
</field>
<field x="63" type="Data" width="12" pattern="1">
<source>#SYSTEM.DATE</source>
</field>
<field x="165" type="Numero" align="right" width="3" pattern="1">
<field x="76" type="Testo" width="4" pattern="1" text="Pag.">
<font italic="1" face="Arial Narrow" size="8" />
</field>
<field x="80" type="Numero" align="right" width="3" pattern="1">
<source>#REPORT.PAGE</source>
</field>
<field x="80" y="1.25" type="Testo" align="center" width="13" pattern="1" text="Margine" />
@ -31,10 +37,6 @@
<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="45" y="3" type="Stringa" width="4" pattern="1">
<font face="Arial Narrow" bold="1" size="9" />
<source>ANNO</source>
</field>
<field x="60" y="3" type="Testo" width="15" pattern="1" text="Stima avanzamento ">
<font italic="1" face="Arial Narrow" size="9" />
</field>
@ -74,6 +76,10 @@
<source>CDCSPEC</source>
<postscript description="H1.1 POSTSCRIPT">MESSAGE COPY,F1.1</postscript>
</field>
<field x="45" y="3" type="Stringa" width="4" id="2" pattern="1">
<font face="Arial Narrow" bold="1" size="9" />
<source>ANNO</source>
</field>
</section>
<section type="Head" level="2" height="1.5">
<groupby>LEVEL &#3C; 2</groupby>
@ -163,7 +169,16 @@ THEN
#THIS !</prescript>
</field>
</section>
<section type="Foot" />
<section type="Foot">
<field border="1" x="1" y="0.25" type="Linea" width="169" height="0" pattern="1" />
<field x="2" y="0.75" type="Testo" width="25" pattern="1" text="Bilancio di commessa per esercizio">
<font italic="1" face="Arial Narrow" bold="1" size="8" />
</field>
<field x="28.5" y="0.75" type="Stringa" width="5" pattern="1">
<font face="Arial Narrow" bold="1" size="9" />
<source>H1.2</source>
</field>
</section>
<section type="Foot" level="1" height="3">
<font italic="1" face="Arial Narrow" bold="1" size="8" />
<field border="2" x="1" y="0.5" type="Linea" width="169" height="0" pattern="1" />

View File

@ -722,9 +722,9 @@ void TPrint_saldana_recordset::create_lines_to_print(const TString& query)
else //livelli di dettaglio semplici
{
if (_tipostampa == 1)
chiave << '|' << fase;
chiave << '|' << fase; //dettaglia x fase
else
chiave << '|' << cdc;
chiave << '|' << cdc; //dettaglia x cdc
}
}

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<report libraries="ve1300" name="ca3900a" orientation="2" lpi="6" class="ca3900a">
<description>Stima ricavi di competenza CA</description>
<font face="Arial Narrow" size="8" />
@ -7,10 +7,16 @@
<field x="1" type="Stringa" width="50" pattern="1">
<source>#SYSTEM.RAGSOC</source>
</field>
<field x="80" type="Data" width="12" pattern="1">
<field x="67" type="Testo" width="10" pattern="1" text="Data stampa">
<font italic="1" face="Arial Narrow" size="8" />
</field>
<field x="77" type="Data" width="12" pattern="1">
<source>#SYSTEM.DATE</source>
</field>
<field x="165" type="Numero" align="right" width="3" pattern="1">
<field x="150" type="Testo" width="4" pattern="1" text="Pag.">
<font italic="1" face="Arial Narrow" size="8" />
</field>
<field x="154" type="Numero" align="right" width="3" pattern="1">
<source>#REPORT.PAGE</source>
</field>
<field border="2" x="1" y="1.5" type="Linea" width="169" height="0" pattern="1" />
@ -41,6 +47,9 @@ MESSAGE RESET,F1.108</prescript>
<font face="Courier New" bold="1" size="16" />
</field>
<field border="2" x="1" y="3.5" type="Linea" width="169" height="0" pattern="1" />
<field x="0.96" y="3" type="Numero" hidden="1" align="right" width="4" id="2" pattern="1">
<source>ANNO</source>
</field>
</section>
<section type="Head" level="2" height="1.5" page_break="1">
<groupby>LEVEL &#3C; 2</groupby>
@ -188,7 +197,16 @@ THEN
#THIS !</prescript>
</field>
</section>
<section type="Foot" />
<section type="Foot">
<field border="1" x="1" y="0.25" type="Linea" width="169" height="0" pattern="1" />
<field x="2" y="0.5" type="Testo" width="20" pattern="1" text="Stima ricavi di competenza">
<font italic="1" face="Arial Narrow" bold="1" size="8" />
</field>
<field x="22" y="0.5" type="Numero" align="right" width="5" pattern="1">
<font face="Arial Narrow" bold="1" size="8" />
<source>H1.2</source>
</field>
</section>
<section type="Foot" level="1" height="3">
<font italic="1" face="Arial Narrow" bold="1" size="8" />
<field border="2" x="1" y="0.75" type="Linea" width="169" height="0" pattern="1" />