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

Patch level :10.0 698

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :
ulteriori aggiustamenti sulla stampa mastrini analitici


git-svn-id: svn://10.65.10.50/trunk@20303 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2010-03-31 14:34:34 +00:00
parent 42f0551460
commit 2cdd77cb3e
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ca/ca3200.cpp
View File

@ -273,20 +273,16 @@ void TPrint_mastrini_ca_recordset::set_custom_filter(TCursor& cur) const
//filtro sui conti selezionati sulla maschera
TRectype darec(cur.curr()), arec(cur.curr()); //record corrente (rmovana (solo movimentati))
if (_daconto.not_empty())
if (_daconto.full())
darec.put(RMOVANA_CODCONTO, _daconto);
if (_dadata.ok() && _anno > 0)
darec.put(RMOVANA_DATACOMP, _dadata);
if (_aconto.not_empty())
if (_aconto.full())
arec.put(RMOVANA_CODCONTO, _aconto);
if (_adata.ok() && _anno > 0)
arec.put(RMOVANA_DATACOMP, _adata);
cur.setregion(darec, arec);
myself = this;
cur.set_filterfunction(mov_filter, true);
cur.set_filterfunction(mov_filter, true); //questa gestirà le date
}
const TImporto& TPrint_mastrini_ca_recordset::saldo_iniziale(const char* conto) const
@ -654,11 +650,19 @@ void TPrint_mastrini_ca::print_or_preview(const bool stampa)
}
rmovana.set_var("#DACONTO", daconto);
rmovana.set_var("#ACONTO", aconto);
for (bool ok = rmovana.move_first(); ok; ok = rmovana.move_next())
const long items = rmovana.items();
if (items > 0)
{
const TString& codice = rmovana.get(logic1 == LF_COMMESSE ? RMOVANA_CODCMS : RMOVANA_CODCCOSTO).as_string();
codici_buoni.add(codice);
TProgind po(items, "Analisi righe movimento analitiche...", true, true);
for (bool ok = rmovana.move_first(); ok; ok = rmovana.move_next())
{
if (!po.addstatus(1))
break;
const TString& codice = rmovana.get(logic1 == LF_COMMESSE ? RMOVANA_CODCMS : RMOVANA_CODCCOSTO).as_string();
codici_buoni.add(codice);
}
}
TISAM_recordset set(logic1 == LF_CDC ? "USE CDC" : "USE COMMESSE"); //..e di conseguenza scrive la use giusta