From 2cdd77cb3e0e37e9e6c73c97cfd3e08309323d10 Mon Sep 17 00:00:00 2001 From: luca Date: Wed, 31 Mar 2010 14:34:34 +0000 Subject: [PATCH] Patch level :10.0 698 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 --- ca/ca3200.cpp | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/ca/ca3200.cpp b/ca/ca3200.cpp index 0eff89751..76d23c3b2 100755 --- a/ca/ca3200.cpp +++ b/ca/ca3200.cpp @@ -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