diff --git a/src/ve/ve0100.cpp b/src/ve/ve0100.cpp
index 3e388e0c9..3962348a9 100755
--- a/src/ve/ve0100.cpp
+++ b/src/ve/ve0100.cpp
@@ -14,6 +14,7 @@
 #include "veuml1.h"
 #include "verig.h"
 #include "velib04.h"
+#include "velib07.h"
 #include "../mg/mglib.h"
 #include "../li/lilib01.h"
 
@@ -80,6 +81,8 @@ bool TMotore_application::save_and_new() const
   return new_doc;
 }
 
+#include <progind.h>
+
 void TMotore_application::init_query_mode( TMask& m )
 {
   disable_menu_item(M_FILE_PRINT);
@@ -294,8 +297,8 @@ void TMotore_application::init_modify_mode( TMask& m )
     if (no_del)
       m.disable(DLG_DELREC);
 
-    if (m.id2pos(F_IBAN_STATO) > 0)
-      m.efield(F_IBAN_STATO).validate(K_TAB); // Decodifica IBAN
+    if (m.id2pos(F_IBAN_CHECK) > 0)
+      m.efield(F_IBAN_CHECK).validate(K_ENTER); // Decodifica IBAN
   }   
   __last_key = key;
 }
@@ -419,7 +422,7 @@ int TMotore_application::read(TMask& m)
   _codnum = m.get(F_CODNUM);
   _tipodoc = m.get(F_TIPODOC);
 
-  mask.doc2mask();
+  mask.doc2mask(false);
 
   return NOERR;
 }
diff --git a/src/ve/ve2400f.uml b/src/ve/ve2400f.uml
index 585e8ca31..537643977 100644
--- a/src/ve/ve2400f.uml
+++ b/src/ve/ve2400f.uml
@@ -12,6 +12,8 @@ BEGIN
   ITEM "LE|Legno"
   ITEM "PL|Plastica"
   ITEM "VE|Vetro"
+  WARNING "Categoria Assente"
+  VALIDATE NOT_EMPTY_CHECK_TARGET FS_SCAT_CONAI
 END
 
 STRING FS_SCAT_CONAI 2
@@ -25,13 +27,15 @@ BEGIN
   DISPLAY "Descrizione@50" S0
   OUTPUT FS_CAT_CONAI CODTAB[1,2]
   OUTPUT FS_SCAT_CONAI CODTAB[3,4]
-  CHECKTYPE REQUIRED
+  WARNING "Categoria Assente"
 END
 
 NUMBER FS_PES_CONAI 15 5
 BEGIN
   PROMPT 2 6 "Peso in Kg    "
-  CHECKTYPE REQUIRED
+  WARNING "Peso non specificato"
+  VALIDATE REQIF_FUNC 1 FS_CAT_CONAI
+  
 END
 
 BUTTON DLG_OK 10 2
diff --git a/src/ve/velib06.cpp b/src/ve/velib06.cpp
index 4acc2edcf..15bf73f42 100755
--- a/src/ve/velib06.cpp
+++ b/src/ve/velib06.cpp
@@ -1519,24 +1519,6 @@ void TDocumento_mask::doc2mask(bool reload_clifo, bool force_load, bool update)
 		  check_field(F_CODCF);
 		  check_field(F_CODINDSP);
     }
-/*
-	  if (id2pos(F_IBAN_STATO) > 0)
-	  {
-		  const TString80 iban = doc().get(DOC_IBAN);
-		  set(F_IBAN, iban);
-		  efield(F_IBAN_STATO).validate(K_TAB);
-		  if (iban.not_empty())
-		  {
-			  set(F_IBAN_STATO, iban.left(2));
-			  set(F_IBAN_CHECK, iban.mid(2,2));
-			  set(F_BBAN			, iban.mid(4));
-			  set(F_BBAN_CIN	, iban.mid(4,1));
-			  set(F_BBAN_ABI	, iban.mid(5,5));
-			  set(F_BBAN_CAB	, iban.mid(10,5));
-			  set(F_BBAN_CONTO, iban.mid(15,12));
-		  }
-    }
-*/
   }
 
 	if (id2pos(F_IBAN_STATO) > 0)
@@ -1545,6 +1527,7 @@ void TDocumento_mask::doc2mask(bool reload_clifo, bool force_load, bool update)
 		set(F_IBAN, iban);
 		if (iban.full())
 		{
+			efield(F_IBAN_STATO).validate(K_TAB);
 			set(F_IBAN_STATO, iban.left(2));
 			set(F_IBAN_CHECK, iban.mid(2,2));
 			set(F_BBAN			, iban.mid(4));
@@ -1552,7 +1535,6 @@ void TDocumento_mask::doc2mask(bool reload_clifo, bool force_load, bool update)
 			set(F_BBAN_ABI	, iban.mid(5,5));
 			set(F_BBAN_CAB	, iban.mid(10,5));
 			set(F_BBAN_CONTO, iban.mid(15,12));
-  		efield(F_IBAN_STATO).validate(K_TAB);
 		}
     else
     {
diff --git a/src/ve/velib07.h b/src/ve/velib07.h
index 2e56ce2ad..0b2e437fa 100755
--- a/src/ve/velib07.h
+++ b/src/ve/velib07.h
@@ -94,7 +94,8 @@ protected:
 
 public:
 	void set_firmval(bool firmval = true) { _cache.set_firmval(firmval);}
-	const TDocumento& doc(const TRectype& rec) { return _cache.doc(rec);}
+	const TDocumento& doc(const TRectype& rec) { return _cache.doc(rec); }
+	const TDocumento& doc() { return _cache.doc(cursor()->curr()); }
   
   TDocument_recordset(const char* use) : TISAM_recordset(use) { }
   virtual ~TDocument_recordset() { }