diff --git a/ps/pd0610300.cpp b/ps/pd0610300.cpp index cd638238b..149e0e2dd 100755 --- a/ps/pd0610300.cpp +++ b/ps/pd0610300.cpp @@ -1,7 +1,7 @@ #include #include +#include #include -#include #include #include #include @@ -45,7 +45,7 @@ bool TSost_condpag_msk::elabora_documenti() TString query; query << "USE DOC SELECT (CODNUM=\"" << codnum << "\")&&(TIPODOC=\"" << tipodoc << "\")&&(STATO=\"" << stato << "\")&&(TIPOCF=\"C\")&&(BETWEEN(CODCF," << dacodcf << "," << acodcf << "))&&(BETWEEN(DATADOC,#DADATA,#ADATA))"; if(totdoc > ZERO) - query << "&&(TOTDOC<=" << totdoc << ')'; + query << "&&(G1:TOTDOC<=" << totdoc << ')'; query << "\n" << "FROM PROVV=\"D\" ANNO=" << daanno << "\n" << "TO PROVV=\"D\" ANNO=" << aanno; @@ -59,9 +59,14 @@ bool TSost_condpag_msk::elabora_documenti() const TString4 codpag = get(F_CODPAG); + TProgind pi(doc.items(), TR("Elaborazione documenti in corso..."), true, true); + //scorro il recordset e aggiorno i documenti che è necessario aggiornare for(bool ok = doc.move_first(); ok; ok = doc.move_next()) { + if (!pi.addstatus(1)) + break; + TRectype& rec = doc.cursor()->curr(); const TString4 codpagdoc = rec.get(DOC_CODPAG);