Patch level :4.0 nopatch per ora

Files correlati     :
Ricompilazione Demo : [ ]
Commento            :perfezionati il report per il CRPA; manca ancora la stima per costi; da provare con dati veri e coerenti (saldop e/o saldov !=0)


git-svn-id: svn://10.65.10.50/trunk@14267 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2006-08-24 10:09:42 +00:00
parent 269fbe4d96
commit 280c3d8f53
2 changed files with 23 additions and 5 deletions

View File

@ -451,7 +451,12 @@ const TVariant& TPrint_bilancio_cms_recordset::get(const char* column_name) cons
if (strcmp(column_name, "ANNO") == 0)
{
var.set(_anno);
}
}
else
if (strcmp(column_name, "TIPOSTIMA") == 0)
{
var.set(_tipostima == 'T' ? "T" : "C");
}
else
{
TAssoc_array& riga = (TAssoc_array&)_righe[_curr];

View File

@ -17,12 +17,25 @@
<field x="70" y="1.75" type="Testo" width="57" pattern="1" text="Costi e ricavi di Commessa maturati nell'esercizio">
<font italic="1" face="Courier New" size="9" />
</field>
<field x="130" y="1.75" type="Testo" width="28" pattern="1" text="Stima avanzamento TEMPO" />
<field x="130" y="1.75" type="Testo" width="23" pattern="1" text="Stima avanzamento " />
<field x="153" y="1.75" type="Array" width="10" pattern="1">
<source>TIPOSTIMA</source>
<list>
<li Value="TEMPO" Code="T" />
<li Value="COSTI" Code="C" />
</list>
</field>
<field x="80" y="2.75" type="Testo" align="center" width="60" pattern="1" text="Costi" />
<field x="150.5" y="2.75" type="Testo" width="10" pattern="1" text="Margine" />
<field x="149.5" y="3.5" type="Testo" width="10" pattern="1" text=" Contribuz. " />
<field x="152.5" y="2.75" type="Testo" align="right" width="8" pattern="1" text="Margine" />
<field x="65" y="3.25" type="Testo" align="right" width="8" pattern="1" text="Ricavi" />
<field x="151" y="3.5" type="Testo" align="right" width="12" pattern="1" text=" Contribuz. " />
<field x="54.5" y="3.75" type="Testo" width="6" pattern="1" text="% Av." />
<field x="70" y="3.75" type="Testo" width="8" pattern="1" text="Ricavi" />
<field x="73" y="3.75" type="Testo" align="right" width="12" pattern="1" text="Lavoro" />
<field x="85" y="3.75" type="Testo" align="right" width="12" pattern="1" text="Incarichi" />
<field x="97" y="3.75" type="Testo" align="right" width="12" pattern="1" text="Consulenze" />
<field x="109" y="3.75" type="Testo" align="right" width="12" pattern="1" text="Materiali" />
<field x="121" y="3.75" type="Testo" align="right" width="12" pattern="1" text="Altri" />
<field x="133" y="3.75" type="Testo" align="right" width="12" pattern="1" text="Tot. costi" />
<field border="1" x="1" y="4.75" type="Linea" width="169" height="0" pattern="1" />
<field x="1" y="3.5" type="Testo" width="15" id="121" pattern="1" text="Commessa" />
</section>