Patch level :2.2 306

Files correlati     :ca3.exe ca3700a.rep
Ricompilazione Demo : [ ]
Commento            :aggiunta la lista multidocumento di origine per una singola riga di stampa (caso di tanti ORF1 del csa)


git-svn-id: svn://10.65.10.50/trunk@13694 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2006-01-16 13:21:14 +00:00
parent adf31aa4e4
commit 3d784beef6
2 changed files with 35 additions and 27 deletions

View File

@ -538,10 +538,11 @@ void TPrint_rendiconto_ca_recordset::scrive_riga(const TRectype& rmovana, const
const int tipo_documento = newdoc->tipo_riclassificato();
int tipo_babbo = TTipo_documento::_altro;
TString80 riferimento; //stringa su cui scrivere gli estremi del doc padre (se lo trova!)
TToken_string riferimento(20, '\n'); //tokenstring su cui scrivere gli estremi dei docs padri (se li trova!)
TString80 rif; //stringa di lavoro su cui viene scritto un doc originale
const int rows = newdoc->physical_rows(); //righe del doc attuale
for (int i = 1; riferimento.empty() && i <= rows; i++)
for (int i = 1; i <= rows; i++) //scandisce tutte le righe del doc..
{
const TRiga_documento& riga = (*newdoc)[i];
const TRectype* babbo = riga.find_original_rdoc(); //cerca il doc padre della riga doc attuale
@ -550,12 +551,19 @@ void TPrint_rendiconto_ca_recordset::scrive_riga(const TRectype& rmovana, const
const TString4 babbo_codnum = babbo->get(RDOC_CODNUM);
const int anno = babbo->get_int(RDOC_ANNO);
const long ndoc = babbo->get_long(RDOC_NDOC);
riferimento << babbo_codnum << '-' << anno << '-' << ndoc;
TDocumento doc_babbo('D', anno, babbo_codnum, ndoc); //crea una copia del doc padre per prendere..
tipo_babbo = doc_babbo.tipo_riclassificato(); //..il tipo documento..
rif.cut(0) << babbo_codnum << '-' << anno << '-' << ndoc;
if (riferimento.get_pos(rif) < 0) //il doc originale va aggiunto solo se non esiste gia'!
{
riferimento.add(rif);
TDocumento doc_babbo('D', anno, babbo_codnum, ndoc); //crea una copia del doc padre per prendere..
tipo_babbo = doc_babbo.tipo_riclassificato(); //..il tipo documento..
}
} //if (babbo != NULL)..
} //for (int i..
tmpcurr.put("DOCORIG", riferimento); //documento di riferimento (mitologico documento originale)
/*[Tipo documento] //schema divino per destinare gli importi nei campi corretti
O=I**
B=IM*
@ -592,7 +600,7 @@ F=IMF*/
default:
break;
}
tmpcurr.put("DOCORIG", riferimento);
} //if(newdoc != NULL)
else //movimenti puri di analitica (no documento di origine!)
{
@ -921,7 +929,7 @@ void TPrint_rendiconto_ca_recordset::crea_trr(const TFilename& trr) const
of << "DATADOCRIF|5|8|0|Data documento riferimento" << endl;
of << "DESC|1|50|0|Descrizione movimento o documento" << endl;
of << "DESCRIGA|1|50|0|Descrizione riga movimento o documento" << endl;
of << "DOCORIG|1|20|0|Riferimento ordine/bolla" << endl;
of << "DOCORIG|11|10|0|Riferimenti ordine/bolla" << endl;
of << "FATTURATO|4|18|5|Fatturato" << endl;
of << "MATURATO|4|18|5|Maturato" << endl;
of << "IMPEGNATO|4|18|5|Impegnato" << endl;

View File

@ -1,11 +1,11 @@
<report libraries="ve1300" name="ca3700a" orientation="2" lpi="8" class="ca3700a">
<report libraries="ve1300" name="ca3700a" orientation="2" lpi="9" class="ca3700a">
<description>Rendiconto CA</description>
<font face="Courier New" size="8" />
<section type="Head" height="5">
<font italic="1" face="Courier New" bold="1" size="8" />
<field x="1" type="Stringa" width="50" pattern="1">
<font italic="1" face="Courier New" bold="1" size="10" />
<font italic="1" face="Courier New" bold="1" size="9" />
<source>#SYSTEM.RAGSOC</source>
</field>
<field x="80" type="Data" width="10" pattern="1">
@ -190,48 +190,48 @@ MESSAGE RESET,F2.103</prescript>
<section type="Body" />
<section type="Body" level="1">
<condition>HIDDEN!='X'</condition>
<field x="19" type="Numero" align="right" width="7" pattern="1" hide_zero="1">
<field x="19" y="0.5" type="Numero" align="right" width="7" pattern="1" hide_zero="1">
<source>NUMREG</source>
</field>
<field x="27" type="Numero" align="right" width="7" pattern="1" hide_zero="1">
<field x="27" y="0.5" type="Numero" align="right" width="7" pattern="1" hide_zero="1">
<source>NUMREGCG</source>
</field>
<field x="35" type="Data" width="10" pattern="1">
<field x="35" y="0.5" type="Data" width="10" pattern="1">
<source>DATA</source>
</field>
<field x="46" type="Stringa" width="7" pattern="1">
<field x="46" y="0.5" type="Stringa" width="7" pattern="1">
<source>NUMDOCRIF</source>
</field>
<field x="54" type="Data" width="10" pattern="1">
<field x="54" y="0.5" type="Data" width="10" pattern="1">
<source>DATADOCRIF</source>
</field>
<field x="65" type="Stringa" dynamic_height="1" width="23" height="2" pattern="1">
<field x="65" y="0.5" type="Stringa" dynamic_height="1" width="23" height="2" pattern="1">
<font face="Arial Narrow" size="8" />
<source>DESC</source>
</field>
<field x="89" type="Numero" align="right" width="3" pattern="1">
<field x="89" y="0.5" type="Numero" align="right" width="3" pattern="1">
<source>NRIGA</source>
</field>
<field x="93" type="Stringa" dynamic_height="1" width="22" height="2" pattern="1">
<field x="93" y="0.5" type="Stringa" dynamic_height="1" width="22" height="2" pattern="1">
<font face="Arial Narrow" size="8" />
<source>DESCRIGA</source>
</field>
<field x="116" type="Stringa" align="right" width="15" pattern="1">
<field x="116" y="0.5" type="Stringa" align="right" dynamic_height="1" width="15" height="20" pattern="1">
<source>DOCORIG</source>
</field>
<field x="132" type="Valuta" align="right" width="12" pattern="1" text="###.###.###,@@">
<field x="132" y="0.5" type="Valuta" align="right" width="12" pattern="1" text="###.###.###,@@">
<source>FATTURATO</source>
<postscript description="B1.0 POSTSCRIPT">MESSAGE ADD,F2.101</postscript>
</field>
<field x="145" type="Valuta" align="right" width="12" pattern="1" text="###.###.###,@@">
<field x="145" y="0.5" type="Valuta" align="right" width="12" pattern="1" text="###.###.###,@@">
<source>MATURATO</source>
<postscript description="B1.0 POSTSCRIPT">MESSAGE ADD,F2.102</postscript>
</field>
<field x="158" type="Valuta" align="right" width="12" pattern="1" text="###.###.###,@@">
<field x="158" y="0.5" type="Valuta" align="right" width="12" pattern="1" text="###.###.###,@@">
<source>IMPEGNATO</source>
<postscript description="B1.0 POSTSCRIPT">MESSAGE ADD,F2.103</postscript>
</field>
<field type="Numero" hidden="1" align="right" width="1" id="100" pattern="1">
<field y="0.5" type="Numero" hidden="1" align="right" width="1" id="100" pattern="1">
<prescript description="B1.100 PRESCRIPT">#THIS @
0 &#3E;
IF
@ -251,15 +251,15 @@ MESSAGE RESET,F2.103</prescript>
1 +
#THIS !</prescript>
</field>
<field x="1" type="Stringa" align="right" width="4" id="101" pattern="1">
<field x="1" y="0.5" type="Stringa" align="right" width="4" id="101" pattern="1">
<source>CODNUM</source>
</field>
<field x="5" type="Testo" width="1" id="102" pattern="1" text="-" />
<field x="6" type="Numero" align="right" width="4" id="103" pattern="1">
<field x="5" y="0.5" type="Testo" width="1" id="102" pattern="1" text="-" />
<field x="6" y="0.5" type="Numero" align="right" width="4" id="103" pattern="1">
<source>ANNO</source>
</field>
<field x="10" type="Testo" width="1" id="104" pattern="1" text="-" />
<field x="11" type="Stringa" width="7" id="105" pattern="1">
<field x="10" y="0.5" type="Testo" width="1" id="104" pattern="1" text="-" />
<field x="11" y="0.5" type="Stringa" width="7" id="105" pattern="1">
<source>NUMRD</source>
</field>
</section>