diff --git a/lv/lv2400.cpp b/lv/lv2400.cpp
index 75d580fe0..5729d06e5 100755
--- a/lv/lv2400.cpp
+++ b/lv/lv2400.cpp
@@ -775,6 +775,7 @@ int TGenera_documenti_app::scansione_ritiri_anticipi(const long codcli, const TD
   query << "USE DOC "
         << "SELECT (TIPOCF=\"C\")&&(BETWEEN(CODCF," << codcli << ',' << codcli << "))&&"
         << "(ANSI(G1:DATAPRCO)<=#ADATA)&&"
+        << "(CODNUM=\"" << codnum << "\")&&(TIPODOC=\"" << tpdoc << "\")&&"
         << "(STATO=\"" << statoi <<"\")\n"
         << "FROM PROVV=\"D\" ANNO="   << daanno  << " CODNUM=\"" << codnum << "\"\n"
         << "TO PROVV=\"D\" ANNO="   << aanno  << " CODNUM=\"" << codnum << "\"\n";
@@ -915,6 +916,7 @@ bool TGenera_documenti_app::transfer()
     TString query;
     query << "USE DOC "
           << "SELECT (ANSI(G1:DATAPRCO)<=#ADATA)&&"
+          << "(CODNUM=\"" << codnum << "\")&&(TIPODOC=\"" << tpdoc << "\")&&"
           << "(STATO=\"" << statoi <<"\")&&"
           << "(TIPOCF=\"C\")&&(BETWEEN(CODCF,#CODCF,#CODCF))\n"
           << "FROM PROVV=\"D\" ANNO=" << daanno << " CODNUM=\"" << codnum << "\"\n"
@@ -961,6 +963,7 @@ bool TGenera_documenti_app::transfer()
         crea_documento(plan, rep, numdocgen, documenti);
       }
     }
+    codcli = _msk->get_long(F_CODCF);
   }
 
   if (_msk->get_bool(F_STAMPA) && documenti.items() > 0)