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

Patch level : 2.2 172

Browse Source 
Files correlati     : ca3
Ricompilazione Demo : [ ]
Commento            :
 Bug  0000436:
La Stampa bilancio stampa saldi errati.  Bisogna stampare il bilancio di verifica e a sezioni contrapposte della commessa RETE2003 sui dati del csa allegati


git-svn-id: svn://10.65.10.50/trunk@13324 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2005-09-01 23:28:02 +00:00
parent 90e759a17e
commit 1f729a966b
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ca/calib02.cpp
View File

@ -182,7 +182,8 @@ bool TPconana_recordset::valid_record(const TRelation& rel) const
if (_tipo == 'C')
{
const TBill b(rel.curr());
if (b.sottoconto() <= 0 || !b.is_analitico())
if ((b.sottoconto() <= 0)) //|| !b.is_analitico())
return false;
conto = b.string(0x8);
}
@ -215,12 +216,13 @@ void TPconana_recordset::set_custom_filter(TCursor& cursor) const
if (_tipo == 'C')
{
TRectype darec(LF_PCON), arec(LF_PCON);
darec.put(PCN_GRUPPO, _da_conto.mid(0,3));
darec.put(PCN_CONTO, _da_conto.mid(3,3));
darec.put(PCN_SOTTOCONTO, _da_conto.mid(6,6));
arec.put(PCN_GRUPPO, _a_conto.mid(0,3));
arec.put(PCN_CONTO, _a_conto.mid(3,3));
arec.put(PCN_SOTTOCONTO, _a_conto.mid(6,6));
darec.put(PCN_GRUPPO, _da_conto.mid(0,3));
darec.put(PCN_CONTO, _da_conto.mid(3,3));
darec.put(PCN_SOTTOCONTO, _da_conto.mid(6,6));
arec.put(PCN_GRUPPO, _a_conto.mid(0,3));
arec.put(PCN_CONTO, _a_conto.mid(3,3));
arec.put(PCN_SOTTOCONTO, _a_conto.mid(6,6));
cursor.setregion(darec, arec);
}
else
@ -610,7 +612,7 @@ bool TSaldi_cache::int_saldo_annuale(const TAnal_bill& b, int da_anno, int ad_an
if (select.not_empty()) select << "&&";
select << "(FASE=='" << b.fase() << "')";
}
if (b.conto().not_empty() && da_anno != ad_anno)
if (b.conto().not_empty()) // && da_anno != ad_anno)
{
if (select.not_empty()) select << "&&";
select << "(CONTO[1," << b.conto().len() << "]=='" << b.conto() << "')";