Patch level : 2.2

Files correlati     :
Ricompilazione Demo : [ ]
Commento            :
Aggiunto totale generale in stampa bilancio di verifica


git-svn-id: svn://10.65.10.50/trunk@13348 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2005-09-19 11:51:22 +00:00
parent 6d67a73f1c
commit 4002d1a8d7
2 changed files with 62 additions and 34 deletions

View File

@ -382,8 +382,13 @@ void TReport_bilancio_verifica::set_filter(const TMask& m, int row)
const TMultilevel_code_info& info = ca_multilevel_code_info(tc == 'A' ? LF_PCONANA : LF_PCON);
for (int s = info.levels()+1; s <= 4; s++)
{
section('H', s).deactivate();
section('F', s).deactivate();
TReport_section& h = section('H', s);
h.deactivate();
h.hide();
TReport_section& f = section('F', s);
f.deactivate();
f.hide();
}
const bool movimentati = m.get_int(F_STAMPAV) == 1;
@ -660,15 +665,9 @@ void TRecordset_sezioni_contrapposte::requery()
{
conto = pconana.get(PCONANA_CODCONTO).as_string();
if (conto.len() < maxlen) // Ignora conti intermedi
continue;
// Ricerca l'indicatore di bilancio sui livelli precedenti
indicatore_bilancio = 0;
for (int l = info.levels()-2; l >= 0 && indicatore_bilancio <= 0; l--)
{
const TString& k = conto.left(info.total_len(l)); // Costruisce codice conto intermedio
indicatore_bilancio = atoi(cache().get(LF_PCONANA, k, PCONANA_INDBIL));
}
continue;
const TAnal_bill b(conto);
indicatore_bilancio = b.indicatore_bilancio();
}
add_conto(indicatore_bilancio, conto);
}
@ -871,9 +870,10 @@ void TReport_bilancio_sezioni_contrapposte::set_filter(const TMask& m, int row)
sf.update_mask(row);
TRelation rel(LF_RMOVANA);
sm.autosave(rel);
const TString80 costo = rel.curr().get(RMOVANA_CODCCOSTO);
const TString80 commessa = rel.curr().get(RMOVANA_CODCMS);
const TString16 fase = rel.curr().get(RMOVANA_CODFASE);
const TRectype& curr = rel.curr();
const TString80 costo = curr.get(RMOVANA_CODCCOSTO);
const TString80 commessa = curr.get(RMOVANA_CODCMS);
const TString16 fase = curr.get(RMOVANA_CODFASE);
TRecordset_sezioni_contrapposte* recset = new TRecordset_sezioni_contrapposte(tipo);
recset->set_filter(tipo, costo, commessa, fase, dal, al, tipimov, movimentati, nonnulli);

View File

@ -4,10 +4,10 @@
<font face="Courier New" size="8" />
<section type="Head">
<font italic="1" face="Courier New" bold="1" size="10" />
<field type="Stringa" width="50" pattern="1">
<field type="Stringa" width="60" pattern="1">
<source>#SYSTEM.RAGSOC</source>
</field>
<field x="90" type="Data" width="10" pattern="1">
<field x="90" type="Data" width="12" pattern="1">
<source>#SYSTEM.DATE</source>
</field>
<field x="164" type="Numero" align="right" width="4" pattern="1">
@ -58,8 +58,6 @@
<groupby>CODCONTO:1</groupby>
<prescript description="H2 PRESCRIPT">"CODCONTO:1" @
"F2.101" !
"DESCR:1" @
"F2.102" !
"F2" AZZERA_TOTALI
</prescript>
@ -69,8 +67,6 @@
<groupby>CODCONTO:2</groupby>
<prescript description="H3 PRESCRIPT">"CODCONTO:2" @
"F3.101" !
"DESCR:2" @
"F3.102" !
"F3" AZZERA_TOTALI</prescript>
</section>
@ -79,13 +75,11 @@
<groupby>CODCONTO:3</groupby>
<prescript description="H4 PRESCRIPT">"CODCONTO:3" @
"F4.101" ! \ Copia il codice conto nel footer
"DESCR:3" @
"F4.102" !
"F4" AZZERA_TOTALI</prescript>
</section>
<section type="Body" />
<section type="Body" level="1">
<section type="Body" level="1" bg_color="#C0C0C0">
<field x="78" type="Valuta" align="right" width="13" pattern="1" hide_zero="1" text="###.###.###,@@">
<source>SALDO:INI_DARE</source>
<postscript description="B1.0 POSTSCRIPT">MESSAGE ADD,F2.103|ADD,F3.103|ADD,F4.103
@ -120,14 +114,32 @@
</field>
</section>
<section type="Foot" />
<section type="Foot" level="1" />
<section type="Foot" level="1">
<font face="Courier New" bold="1" size="8" />
<field x="25" y="1" type="Testo" width="50" id="102" pattern="1" text="Totale">
<prescript description="F1.102 PRESCRIPT">MESSAGE ISAMREAD,PCONANA,CODCONTO=#102,DESCR</prescript>
</field>
<field x="78" y="1" type="Valuta" align="right" width="13" id="103" pattern="1" hide_zero="1" text="###.###.###,@@">
<prescript>103 DARE_AVERE</prescript>
</field>
<field x="92" y="1" type="Valuta" align="right" width="13" id="104" pattern="1" hide_zero="1" text="###.###.###,@@" />
<field x="109" y="1" type="Valuta" align="right" width="13" id="105" pattern="1" hide_zero="1" text="###.###.###,@@" />
<field x="123" y="1" type="Valuta" align="right" width="13" id="106" pattern="1" hide_zero="1" text="###.###.###,@@" />
<field x="141" y="1" type="Valuta" align="right" width="13" id="107" pattern="1" hide_zero="1" text="###.###.###,@@">
<prescript>107 DARE_AVERE</prescript>
</field>
<field x="155" y="1" type="Valuta" align="right" width="13" id="108" pattern="1" hide_zero="1" text="###.###.###,@@" />
</section>
<section type="Foot" level="2">
<condition>#101 != ""</condition>
<font face="Courier New" bold="1" size="8" />
<field type="Stringa" width="23" id="101" pattern="1">
<prescript description="F2.101 PRESCRIPT">CA_FORMAT_CONTO</prescript>
<prescript description="F2.101 PRESCRIPT">#THIS @ #102 !
CA_FORMAT_CONTO</prescript>
</field>
<field x="25" type="Stringa" width="50" id="102" pattern="1">
<prescript description="F2.102 PRESCRIPT">MESSAGE ISAMREAD,PCONANA,CODCONTO=#102,DESCR</prescript>
</field>
<field x="25" type="Stringa" width="50" id="102" pattern="1" />
<field x="78" type="Valuta" align="right" width="13" id="103" pattern="1" hide_zero="1" text="###.###.###,@@">
<prescript description="F2.103 PRESCRIPT">103 DARE_AVERE</prescript>
</field>
@ -143,9 +155,12 @@
<condition>#101 != ""</condition>
<font face="Courier New" bold="1" size="8" />
<field type="Stringa" width="23" id="101" pattern="1">
<prescript description="F3.101 PRESCRIPT">CA_FORMAT_CONTO</prescript>
<prescript description="F3.101 PRESCRIPT">#THIS @ #102 !
CA_FORMAT_CONTO</prescript>
</field>
<field x="25" type="Stringa" width="50" id="102" pattern="1">
<prescript description="F3.102 PRESCRIPT">MESSAGE ISAMREAD,PCONANA,CODCONTO=#102,DESCR</prescript>
</field>
<field x="25" type="Stringa" width="50" id="102" pattern="1" />
<field x="78" type="Valuta" align="right" width="13" id="103" pattern="1" hide_zero="1" text="###.###.###,@@">
<prescript description="F3.103 PRESCRIPT">103 DARE_AVERE</prescript>
</field>
@ -161,19 +176,32 @@
<condition>#101 != ""</condition>
<font face="Courier New" bold="1" size="8" />
<field type="Stringa" width="23" id="101" pattern="1">
<prescript description="F4.101 PRESCRIPT">CA_FORMAT_CONTO</prescript>
<prescript description="F4.101 PRESCRIPT">#THIS @ #102 !
CA_FORMAT_CONTO</prescript>
</field>
<field x="25" type="Stringa" width="50" id="102" pattern="1">
<prescript description="F4.102 PRESCRIPT">MESSAGE ISAMREAD,PCONANA,CODCONTO=#102,DESCR</prescript>
</field>
<field x="25" type="Stringa" width="50" id="102" pattern="1" />
<field x="78" type="Valuta" align="right" width="13" id="103" pattern="1" hide_zero="1" text="###.###.###,@@">
<prescript description="F4.103 PRESCRIPT">103 DARE_AVERE</prescript>
<postscript description="F4.103 POSTSCRIPT">MESSAGE ADD,F1.103</postscript>
</field>
<field x="92" type="Valuta" align="right" width="13" id="104" pattern="1" hide_zero="1" text="###.###.###,@@">
<postscript description="F4.104 POSTSCRIPT">MESSAGE ADD,F1.104</postscript>
</field>
<field x="109" type="Valuta" align="right" width="13" id="105" pattern="1" hide_zero="1" text="###.###.###,@@">
<postscript description="F4.105 POSTSCRIPT">MESSAGE ADD,F1.105</postscript>
</field>
<field x="123" type="Valuta" align="right" width="13" id="106" pattern="1" hide_zero="1" text="###.###.###,@@">
<postscript description="F4.106 POSTSCRIPT">MESSAGE ADD,F1.106</postscript>
</field>
<field x="92" type="Valuta" align="right" width="13" id="104" pattern="1" hide_zero="1" text="###.###.###,@@" />
<field x="109" type="Valuta" align="right" width="13" id="105" pattern="1" hide_zero="1" text="###.###.###,@@" />
<field x="123" type="Valuta" align="right" width="13" id="106" pattern="1" hide_zero="1" text="###.###.###,@@" />
<field x="141" type="Valuta" align="right" width="13" id="107" pattern="1" hide_zero="1" text="###.###.###,@@">
<prescript description="F4.107 PRESCRIPT">107 DARE_AVERE</prescript>
<postscript description="F4.107 POSTSCRIPT">MESSAGE ADD,F1.107</postscript>
</field>
<field x="155" type="Valuta" align="right" width="13" id="108" pattern="1" hide_zero="1" text="###.###.###,@@">
<postscript description="F4.108 POSTSCRIPT">MESSAGE ADD,F1.108</postscript>
</field>
<field x="155" type="Valuta" align="right" width="13" id="108" pattern="1" hide_zero="1" text="###.###.###,@@" />
</section>
<sql>USE PCONANA</sql>
<prescript description="PRESCRIPT">: AZZERA_TOTALI ( ID_SEC - )