Patch level :2.2 306

Files correlati     :ca3.exe ca3700a.rep
Ricompilazione Demo : [ ]
Commento            :stampa rendiconto: inserito camo numregcg, tenuto conto dell'anno nelle causali, cambiata interlinea per capire qualcosa nella stampa


git-svn-id: svn://10.65.10.50/trunk@13692 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2006-01-12 19:03:35 +00:00
parent 3a33692ff7
commit 535e65326a
2 changed files with 23 additions and 18 deletions

View File

@ -539,7 +539,6 @@ void TPrint_rendiconto_ca_recordset::scrive_riga(const TRectype& rmovana, const
int tipo_babbo = TTipo_documento::_altro;
TString80 riferimento; //stringa su cui scrivere gli estremi del doc padre (se lo trova!)
real totale_doc_babbo; //totale del doc padre
const int rows = newdoc->physical_rows(); //righe del doc attuale
for (int i = 1; riferimento.empty() && i <= rows; i++)
@ -554,7 +553,6 @@ void TPrint_rendiconto_ca_recordset::scrive_riga(const TRectype& rmovana, const
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..
totale_doc_babbo = doc_babbo.totale_doc(); //..il suo totale
} //if (babbo != NULL)..
} //for (int i..
@ -607,8 +605,9 @@ F=IMF*/
const char sezione = rmovana.get_char(RMOVANA_SEZIONE);
TImporto imp(sezione, rmovana.get_real(RMOVANA_IMPORTO));
const int anno_caus = movana.get_date(MOVANA_DATAREG).year();
TCausale caus(movana.get(MOVANA_CODCAUS));
TCausale caus(movana.get(MOVANA_CODCAUS), anno_caus);
TipoIVA tipoiva = caus.iva();
char sezione_normale;
@ -645,6 +644,7 @@ F=IMF*/
}
tmpcurr.put("NUMREG", rmovana.get(RMOVANA_NUMREG));
tmpcurr.put("NUMREGCG", movana.get(MOVANA_NUMREGCG)); //numero di registrazione contabile
tmpcurr.put("DESC", descr); //descrizione movana
tmpcurr.put("NRIGA", rmovana.get(RMOVANA_NUMRIG)); //numero riga
tmpcurr.put("DESCRIGA", rmovana.get(RMOVANA_DESCR)); //descrizione rmovana
@ -908,13 +908,14 @@ void TPrint_rendiconto_ca_recordset::crea_trr(const TFilename& trr) const
{
ofstream of(trr);
of << 1000 << endl;
of << 17 << endl;
of << 18 << endl;
of << "CONTO|1|20|0|Conto analitico" << endl;
of << "DATA|5|8|0|Data movimento o documento" << endl;
of << "CODNUM|1|4|0|Numerazione documento" << endl;
of << "NUMRD|3|7|0|Numero registrazione contabile o numero documento di origine" << endl;
of << "NRIGA|2|3|0|Riga movimento o documento" << endl;
of << "NUMREG|3|7|0|Numero registrazione del movimento analitico" << endl;
of << "NUMREGCG|3|7|Numero registrazione contabile" << endl;
of << "ANNO|9|4|0|Anno" << endl;
of << "NUMDOCRIF|1|7|0|Numero documento riferimento" << endl;
of << "DATADOCRIF|5|8|0|Data documento riferimento" << endl;

View File

@ -15,16 +15,17 @@
<source>#REPORT.PAGE</source>
</field>
<field border="2" x="1" y="2" type="Linea" width="169" height="0" pattern="1" />
<field x="39" y="2.5" type="Testo" width="23" pattern="1" text="Doc. cliente&#2F;fornitore" />
<field x="44" y="2.5" type="Testo" width="23" pattern="1" text="Doc. cliente&#2F;fornitore" />
<field x="117" y="2.5" type="Testo" align="center" width="12" pattern="1" text="Riferimento" />
<field x="141" y="2.5" type="Testo" width="25" pattern="1" text="Avanzamento costi&#2F;ricavi" />
<field x="19" y="3.5" type="Testo" width="7" pattern="1" text="N. Reg." />
<field x="27" y="3.5" type="Testo" align="center" width="11" pattern="1" text="Data" />
<field x="38" y="3.5" type="Testo" align="center" width="6" pattern="1" text="Numero" />
<field x="47" y="3.5" type="Testo" align="center" width="10" pattern="1" text="Data" />
<field x="59" y="3.5" type="Testo" width="25" pattern="1" text="Descrizione testata" />
<field x="85" y="3.5" type="Testo" width="4" pattern="1" text="Riga" />
<field x="90" y="3.5" type="Testo" width="15" pattern="1" text="Descrizione riga" />
<field x="20" y="3.5" type="Testo" width="7" pattern="1" text="N.Reg." />
<field x="27" y="3.5" type="Testo" width="8" pattern="1" text="N.Reg.CG" />
<field x="35" y="3.5" type="Testo" align="center" width="10" pattern="1" text="Data" />
<field x="47" y="3.5" type="Testo" align="center" width="6" pattern="1" text="Numero" />
<field x="53" y="3.5" type="Testo" align="center" width="10" pattern="1" text="Data" />
<field x="65" y="3.5" type="Testo" width="22" pattern="1" text="Descrizione testata" />
<field x="88" y="3.5" type="Testo" width="4" pattern="1" text="Riga" />
<field x="93" y="3.5" type="Testo" width="15" pattern="1" text="Descrizione riga" />
<field x="117" y="3.5" type="Testo" align="center" width="12" pattern="1" text="Ordine&#2F;Bolla" />
<field x="132" y="3.5" type="Testo" align="right" width="12" pattern="1" text="Fatturato" />
<field x="145" y="3.5" type="Testo" align="right" width="12" pattern="1" text="Maturato" />
@ -192,23 +193,26 @@ MESSAGE RESET,F2.103</prescript>
<field x="19" type="Numero" align="right" width="7" pattern="1" hide_zero="1">
<source>NUMREG</source>
</field>
<field x="28" type="Data" width="10" pattern="1">
<field x="27" type="Numero" align="right" width="7" pattern="1" hide_zero="1">
<source>NUMREGCG</source>
</field>
<field x="35" type="Data" width="10" pattern="1">
<source>DATA</source>
</field>
<field x="39" type="Stringa" width="7" pattern="1">
<field x="46" type="Stringa" width="7" pattern="1">
<source>NUMDOCRIF</source>
</field>
<field x="48" type="Data" width="10" pattern="1">
<field x="54" type="Data" width="10" pattern="1">
<source>DATADOCRIF</source>
</field>
<field x="59" type="Stringa" dynamic_height="1" width="25" height="2" pattern="1">
<field x="65" type="Stringa" dynamic_height="1" width="23" height="2" pattern="1">
<font face="Arial Narrow" size="8" />
<source>DESC</source>
</field>
<field x="86" type="Numero" align="right" width="3" pattern="1">
<field x="89" type="Numero" align="right" width="3" pattern="1">
<source>NRIGA</source>
</field>
<field x="90" type="Stringa" dynamic_height="1" width="25" height="2" pattern="1">
<field x="93" type="Stringa" dynamic_height="1" width="22" height="2" pattern="1">
<font face="Arial Narrow" size="8" />
<source>DESCRIGA</source>
</field>