root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level :4.0 820

Browse Source 
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
This commit is contained in:
luca 2007-11-15 10:13:45 +00:00
parent 389bb15501
commit 6d99b66eda
3 changed files with 10 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ca/ca3800b.rep
View File

@ -117,20 +117,6 @@
<postscript description="H3.101 POSTSCRIPT">MESSAGE COPY,F3.101</postscript> <postscript description="H3.101 POSTSCRIPT">MESSAGE COPY,F3.101</postscript>
</field> </field>
</section> </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" />
<section type="Body" level="1" hidden="1"> <section type="Body" level="1" hidden="1">
<prescript description="B1 PRESCRIPT">1 #H4.3 \ incrementa il contatore per il numero di righe di fase <prescript description="B1 PRESCRIPT">1 #H4.3 \ incrementa il contatore per il numero di righe di fase
@ -151,8 +137,7 @@
</field> </field>
<field x="91" type="Testo" align="center" width="2" pattern="1" text="%" /> <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="###.###.###,@@"> <field x="59" type="Valuta" align="right" width="13" id="69" pattern="1" text="###.###.###,@@">
<postscript description="B1.69 POSTSCRIPT">MESSAGE ADD,F4.69 <postscript description="B1.69 POSTSCRIPT">MESSAGE ADD,F3.69</postscript>
MESSAGE ADD,F3.69</postscript>
</field> </field>
<field x="73" type="Valuta" align="right" width="13" id="169" pattern="1" text="###.###.###,@@"> <field x="73" type="Valuta" align="right" width="13" id="169" pattern="1" text="###.###.###,@@">
<source>#RICAVI-#COSTI</source> <source>#RICAVI-#COSTI</source>
@ -242,17 +227,5 @@ MESSAGE RESET,169</postscript>
MESSAGE RESET,169</postscript> MESSAGE RESET,169</postscript>
</field> </field>
</section> </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> <sql>USE SALDANA</sql>
</report> </report>

29
ca/ca3800c.rep
View File

@ -117,20 +117,6 @@
<postscript description="H3.101 POSTSCRIPT">MESSAGE COPY,F3.101</postscript> <postscript description="H3.101 POSTSCRIPT">MESSAGE COPY,F3.101</postscript>
</field> </field>
</section> </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" />
<section type="Body" level="1" hidden="1"> <section type="Body" level="1" hidden="1">
<prescript description="B1 PRESCRIPT">1 #H4.3 \ incrementa il contatore per il numero di righe di cdc <prescript description="B1 PRESCRIPT">1 #H4.3 \ incrementa il contatore per il numero di righe di cdc
@ -151,8 +137,7 @@
</field> </field>
<field x="91" type="Testo" align="center" width="2" pattern="1" text="%" /> <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="###.###.###,@@"> <field x="59" type="Valuta" align="right" width="13" id="69" pattern="1" text="###.###.###,@@">
<postscript description="B1.69 POSTSCRIPT">MESSAGE ADD,F4.69 <postscript description="B1.69 POSTSCRIPT">MESSAGE ADD,F3.69</postscript>
MESSAGE ADD,F3.69</postscript>
</field> </field>
<field x="73" type="Valuta" align="right" width="13" id="169" pattern="1" text="###.###.###,@@"> <field x="73" type="Valuta" align="right" width="13" id="169" pattern="1" text="###.###.###,@@">
<source>#RICAVI-#COSTI</source> <source>#RICAVI-#COSTI</source>
@ -242,17 +227,5 @@ MESSAGE RESET,169</postscript>
MESSAGE RESET,169</postscript> MESSAGE RESET,169</postscript>
</field> </field>
</section> </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> <sql>USE SALDANA</sql>
</report> </report>

10
ca/ca3883.cpp
View File

@ -222,8 +222,10 @@ void TCRPA_report::offset_and_fill_columns(TReport_section& rep_sect,
new_field->set_field(str_arr.row(i)); new_field->set_field(str_arr.row(i));
TString ps = "MESSAGE ADD,F3."; TString ps = "MESSAGE ADD,F3.";
ps << new_field->id(); ps << new_field->id();
ps << "|ADD,F4.";
ps << new_field->id(); if (find_section('F', 4) != NULL)
ps << "|ADD,F4." << new_field->id();
new_field->set_postscript(ps); new_field->set_postscript(ps);
} }
break; break;
@ -298,7 +300,7 @@ bool TCRPA_report::generate_columns (TString_array& codici, TString_array& testa
} }
//footers //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); TReport_section& foot = section('F', i);
@ -813,10 +815,12 @@ void TPrint_saldana_recordset::requery()
switch (_tipostampa) switch (_tipostampa)
{ {
case 1: case 1:
case 4:
if (_fase.full()) if (_fase.full())
query << " SELECT FASE=\"" << _fase << "\""; query << " SELECT FASE=\"" << _fase << "\"";
break; break;
case 2: case 2:
case 8:
if (_cdc.full()) if (_cdc.full())
query << " SELECT COSTO=\"" << _cdc << "\""; query << " SELECT COSTO=\"" << _cdc << "\"";
break; break;