diff --git a/lv/lv3400.cpp b/lv/lv3400.cpp
index ab4fa26e7..d63810f6d 100755
--- a/lv/lv3400.cpp
+++ b/lv/lv3400.cpp
@@ -519,7 +519,9 @@ void TEvasione_ter_msk::genera_buono()
   disable(DLG_PREVIEW);
   disable(DLG_ELABORA);
   disable(DLG_SAVEREC);
-  disable(DLG_CANCEL);  
+  disable(DLG_CANCEL);
+
+  enable(F_TNDOC);
 }
 
 //EVADI: metodo che setta a evaso tutte le righe del documento
@@ -911,7 +913,7 @@ bool TEvasione_ter_msk::on_field_event(TOperable_field& f, TField_event e, long
         int cazzone = 1;
         if (kdoc.full())
         {
-          set(F_TANNO, kdoc.mid(1,4));
+          set(F_TANNO, atol(kdoc.left(4)));
           set(F_TNDOC, atol(kdoc.mid(4)));
           field(F_TNDOC).check();
 
@@ -938,6 +940,8 @@ bool TEvasione_ter_msk::on_field_event(TOperable_field& f, TField_event e, long
           enable(DLG_SAVEREC);
           enable(DLG_CANCEL);
 
+          disable(F_TNDOC);
+
           _autoselect = 1;
           field(F_TBARCODE).set_focus();
           f.hide();
@@ -976,6 +980,8 @@ bool TEvasione_ter_msk::on_field_event(TOperable_field& f, TField_event e, long
           enable(DLG_SAVEREC);
           enable(DLG_CANCEL);
 
+          disable(F_TNDOC);
+
           _autoselect = 1;
           field(F_TBARCODE).set_focus();
         }
@@ -1003,6 +1009,9 @@ bool TEvasione_ter_msk::on_field_event(TOperable_field& f, TField_event e, long
           disable(DLG_CANCEL);
           
           reset(F_TDATADOC);
+
+          enable(F_TNDOC);
+
           _ra.destroy();
         }
     }