diff --git a/src/f9/f90100.cpp b/src/f9/f90100.cpp
index 8dc626b57..23cc5fd59 100644
--- a/src/f9/f90100.cpp
+++ b/src/f9/f90100.cpp
@@ -51,6 +51,7 @@ const TString&  recset_get_string(const TRecordset& rec, const char* field, int
 int             recset_get_int(const TRecordset& rec, const char* field, int zero_filled = -1);
 bool            recset_get_bool(const TRecordset& rec, const char* field);
 real            recset_get_real(const TRecordset& rec, const char* field);
+TDate           recset_get_date(const TRecordset& rec, const char* field);
 
 TMask& descr_msk()
 {
@@ -113,7 +114,10 @@ real recset_get_real(const TRecordset& rec, const char* field)
   return rec.get(rec.find_column(field)).as_real();
 }
 
-
+TDate recset_get_date(const TRecordset& rec, const char* field)
+{
+  return rec.get(rec.find_column(field)).as_date();
+}
 
 
 ////////////////////////////////////////////////////////
@@ -175,8 +179,8 @@ int TEstrai_mask::estrai()
       movimento_t t;
       t.err         = false;
       t.numreg      = recset_get_int(mov, MOV_NUMREG);
-      t.datareg     = recset_get_string(mov, MOV_DATAREG);
-      t.datadoc     = recset_get_string(mov, MOV_DATADOC);
+      t.datareg     = recset_get_date(mov, MOV_DATAREG);
+      t.datadoc     = recset_get_date(mov, MOV_DATADOC);
       t.codcaus     = recset_get_string(mov, MOV_CODCAUS, 3);
       t.meseliq     = recset_get_int(mov, MOV_MESELIQ);
       t.numdoc      = recset_get_string(mov, MOV_NUMDOC);
@@ -1210,13 +1214,15 @@ void TF9_app::open_esclusi()
         m.add(movs.get_date(MOV_DATADOC));
         m.add(movs.get(MOV_CODCAUS));
         m.add(movs.get(MOV_MESELIQ));
-        m.add(movs.get(MOV_NUMDOC));
+        TString numdoc; numdoc << movs.get(MOV_NUMDOCEXT);
+        m.add(numdoc.full() ? numdoc : movs.get(MOV_NUMDOC));
         const real imptot = movs.get_real(MOV_TOTDOC) + movs.get_real(MOV_RITFIS) + movs.get_real(MOV_RITSOC);
         m.add(imptot);
         m.add(movs.get_int(MOV_CODCF));
         TLocalisamfile clifo(LF_CLIFO);
-        TString ragsoc; ragsoc = clifo.get(CLI_RAGSOC);
-        m.add(ragsoc);
+        clifo.put(CLI_TIPOCF, movs.get(MOV_TIPO));
+        clifo.put(CLI_CODCF,  movs.get(MOV_CODCF));
+        m.add(clifo.read() == NOERR ? clifo.get(CLI_RAGSOC) : "");
         m.add(TString(movs.get(MOV_REG)) << "/" << movs.get(MOV_PROTIVA));
         m.add(movs.get(MOV_DESCR));
         f9_app()._esclusi_vect.insert(f9_app()._esclusi_vect.end(), m);
diff --git a/src/f9/f90300.cpp b/src/f9/f90300.cpp
index c4464ae87..53192a29c 100644
--- a/src/f9/f90300.cpp
+++ b/src/f9/f90300.cpp
@@ -459,7 +459,9 @@ void TGestione_doc_cartacei_f9_msk::fill()
 void TGestione_doc_cartacei_f9_msk::fill_annessi()
 {
   std::set<TString> file_err;
-
+  TSheet_field& sf = sfield(S_ANNESSI);
+  sf.hide();
+  sf.destroy();
   TLocalisamfile ann(LF_F9ANNESSI);
   if(ann.first() == NOERR)
   {
@@ -469,9 +471,6 @@ void TGestione_doc_cartacei_f9_msk::fill_annessi()
       file_err.insert(namefile);
 
     TLocalisamfile mov(LF_MOV);
-    TSheet_field& sf = sfield(S_ANNESSI);
-    sf.hide();
-    sf.destroy();
     do
     {
       TToken_string&  row     = sf.row(-1);
@@ -494,9 +493,9 @@ void TGestione_doc_cartacei_f9_msk::fill_annessi()
 
       _list_ann.insert({ namefile, { numreg, namefile, ann.get(F9A_CATDOCPAD), ann.get(F9A_CATDOCANN), ann.get(F9C_LOADDATE), ann.get(F9C_USER) } });
     } while (ann.next() == NOERR);
-    sf.force_update();
-    sf.show();
   }
+  sf.force_update();
+  sf.show();
 
   if (!file_err.empty())
   {
@@ -563,9 +562,11 @@ void TGestione_doc_cartacei_f9_msk::fill_docs()
 
       _list_file.insert({ namefile, { namefile, files.get(F9C_LOADDATE), numreg, files.get(F9C_USER) } });
     } while (files.next() == NOERR);
-    sf.force_update();
+    
   }
+  sf.force_update();
   sf.show();
+
   if (!file_err.empty())
   {
     int count = 0;
diff --git a/src/f9/f9lib01.cpp b/src/f9/f9lib01.cpp
index d873d5fe3..519acffdb 100644
--- a/src/f9/f9lib01.cpp
+++ b/src/f9/f9lib01.cpp
@@ -289,8 +289,6 @@ bool TEstrazione::is_integr_rev(const int numreg, _Out_ TString& numreg_rev_vend
     {
       movcoll = mov_rs.get(MOV_NUMREG).as_int();
       curr.put(MOV_MOVCOLL, numreg);
-      TLocalisamfile& f = TLocalisamfile(LF_MOV);
-      curr.rewrite(f);
       break;
     }
   }