diff --git a/ve/tclifor.cpp b/ve/tclifor.cpp
index 2a7d8bc1c..746545a3f 100755
--- a/ve/tclifor.cpp
+++ b/ve/tclifor.cpp
@@ -197,7 +197,7 @@ void TCliForVendite::update_mask( TMask& m, bool onload )
     m.check_field(F_DATACAMBIO1);
   m.check_field(F_COMCF);
   m.check_field(F_STATOCF);
-  m.check_field( F_CODPAG );
+//  m.check_field( F_CODPAG );
   if (m.id2pos(F_CODLIN) >= 0 && m.field(F_CODLIN).active())
     m.check_field( F_CODLIN );
   // m.check_field( F_CODABIA );
diff --git a/ve/velib01.cpp b/ve/velib01.cpp
index 123c4005f..b92d1f796 100755
--- a/ve/velib01.cpp
+++ b/ve/velib01.cpp
@@ -140,9 +140,10 @@ bool dummy_hndl(TMask_field& field, KEY key)
 // Handler per il calcolo delle date di pagamento
 bool condpag_hndl( TMask_field& field, KEY key )
 {                
-  if ( field.to_check(key))
+  TDocumento_mask& m = (TDocumento_mask &) field.mask( );
+  
+  if ( field.to_check(key) || (key == K_TAB && !m.is_running()))
   {
-    TDocumento_mask& m = (TDocumento_mask &) field.mask( );
     const TString16 condpag(m.get(F_CODPAG));
     TString16 data(m.get(F_DATAINSC));      
     
@@ -158,7 +159,10 @@ bool condpag_hndl( TMask_field& field, KEY key )
       if (numrate > 5)
         numrate = 5;
       for( int i = 0; i < numrate; i ++ )
+      {
+        m.show( F_DATASCAD1 + i );
         m.set( F_DATASCAD1 + i, pag.data_rata(i).string());
+      }
       for( ; i < 5; i ++ )
         m.hide( F_DATASCAD1 + i );
     }