diff --git a/lv/lv2500.cpp b/lv/lv2500.cpp index 816d41053..c2c5684c8 100755 --- a/lv/lv2500.cpp +++ b/lv/lv2500.cpp @@ -2024,12 +2024,12 @@ void TFatturazione_lav_app::main_loop() //preparo la query TString query; - TString16 fromcod = _msk->get(F_DACODCF); fromcod.lpad(6); - TString16 tocod = _msk->get(F_ACODCF); tocod.lpad(6); + TString16 fromcod = _msk->get(F_DACODCF); + TString16 tocod = _msk->get(F_ACODCF); //&&(BETWEEN(DATADOC,#DADATA,#ADATA))&&(STATO==\"2\")&&(TIPODOC==\"B01\") query << "USE DOC KEY 3 SELECT (TIPOCF==\"C\")&&" - << "(BETWEEN(CODCF,\"" << fromcod << "\",\"" << tocod << "\"))\n" + << "STR(BETWEEN(CODCF,\"" << fromcod << "\",\"" << tocod << "\"))\n" << "BY TIPOCF CODCF DATADOC\n" << "FROM DATADOC=" << dal << " PROVV=D ANNO=" << year << "\n" << "TO DATADOC=" << al << " PROVV=D ANNO=" << year << "\n"; @@ -2037,7 +2037,8 @@ void TFatturazione_lav_app::main_loop() // << "FROM " << "TIPOCF=C PROVV=D ANNO=#ANNO DATADOC=#DADATA \n" // << "TO " << "TIPOCF=C PROVV=D ANNO=#ANNO DATADOC=#ADATA \n"; - //instanzio il recordset + //instanzio il recordset011 + TISAM_recordset recset(query); TProgind pi(recset.items(), "Fatturazione", true, true); long last_clifo = 0;