diff --git a/src/ve/ve0100a.uml b/src/ve/ve0100a.uml
index b9b68946e..15a117a6d 100755
--- a/src/ve/ve0100a.uml
+++ b/src/ve/ve0100a.uml
@@ -164,27 +164,17 @@ END
 NUMBER F_CODCF 6
 BEGIN
   PROMPT 24 8 "Codice      " 
-  
-  /*
-  USE LF_DOC KEY 2 SELECT (CODNUM==#F_CODNUM)&&(PROVV==#F_PROVV)&&(ANNO==#F_ANNO)&&((#F_STATO=="")||(STATO==#F_STATO))
-  JOIN LF_CLIFO INTO TIPOCF==TIPOCF CODCF==CODCF
-  JOIN LF_COMUNI TO LF_CLIFO INTO STATO==STATOCF COM==COMCF
-  INPUT TIPOCF F_TIPOCF SELECT
-  INPUT CODCF F_CODCF SELECT
-  INPUT PROVV F_PROVV
-  INPUT ANNO F_ANNO 
-  */
-  
   USE LF_DOC SELECT (TIPOCF==#F_TIPOCF)&&((#F_CODCF="")||(CODCF==#F_CODCF))&&((#F_STATO=="")||(STATO==#F_STATO)) 
   BY LF_CLIFO->CODCF NDOC
   JOIN LF_CLIFO INTO TIPOCF==TIPOCF CODCF==CODCF
+  JOIN LF_COMUNI TO LF_CLIFO INTO STATO==STATOCF COM==COMCF
   INPUT PROVV F_PROVV SELECT
   INPUT ANNO F_ANNO SELECT
   INPUT CODNUM F_CODNUM SELECT
   
   DISPLAY "Codice" CODCF
   DISPLAY "Ragione Sociale@50" LF_CLIFO->RAGSOC
-	DISPLAY "Partita IVA@12" LF_CLIFO->PAIV
+  DISPLAY "Partita IVA@12" LF_CLIFO->PAIV
   DISPLAY "Num." CODNUM
   DISPLAY "Anno" ANNO
   DISPLAY "Provv" PROVV
diff --git a/src/ve/ve1700.cpp b/src/ve/ve1700.cpp
index 105e0d363..266ccdaac 100644
--- a/src/ve/ve1700.cpp
+++ b/src/ve/ve1700.cpp
@@ -201,7 +201,7 @@ bool TStampa_lista_docs_mask::on_field_event(TOperable_field& o, TField_event e,
 }
 
 TStampa_lista_docs_mask::TStampa_lista_docs_mask()
-												: TAutomask("ve1600a"), 
+												: TAutomask("ve1700a"), 
 												  _clifo(new TCursor(new TRelation(LF_CLIFO)),
 												  " |CODCF|RAGSOC", TR("Selezione Clienti/Fornitori"),
                           HR("@1|Codice@6R|Descrizione@50"), 0, 1)
@@ -458,7 +458,7 @@ void TListaDoc_application::main_loop()
   TStampa_lista_docs_mask m;
   TLista_documenti_report report(&m);
 
-	m.set(F_REPORT, "ve16001");
+	m.set(F_REPORT, "ve17001");
 
   while (m.run() != K_QUIT)
   {
@@ -466,12 +466,11 @@ void TListaDoc_application::main_loop()
     TFilename report_name = m.get(F_REPORT);
 
 		if (report_name.blank())
-			report_name = "ve16001";
+			report_name = "ve17001";
     report.load(report_name); 
     book.add(report);
     if (book.pages() > 0)
       book.print_or_preview();
-		m.set(F_REPORT, "ve16001");
   } 
 }
 
diff --git a/src/ve/velib07.cpp b/src/ve/velib07.cpp
index a307c5404..2566714c8 100755
--- a/src/ve/velib07.cpp
+++ b/src/ve/velib07.cpp
@@ -751,7 +751,8 @@ bool TDocument_report::execute_usr_word(unsigned int opcode, TVariant_stack& sta
     default: break;
   }
 
-  while (!stack.pop().is_null());  // Svuota eventuali parametri variabili inutilizzati
+  while (stack.items() > 0)
+		stack.pop();  // Svuota eventuali parametri variabili inutilizzati
 
   return true;
 }