diff --git a/lv/lv0600.cpp b/lv/lv0600.cpp
index 4537a71e6..3d9f177be 100755
--- a/lv/lv0600.cpp
+++ b/lv/lv0600.cpp
@@ -20,8 +20,12 @@ public:
 bool TGestione_bolle_msk::lv_bolla_handler(TMask_field& f, KEY k)
 {
   bool ok = true;
-  if (f.dlg() == F_CODCF)
-    ok = TDocumento_mask::clifo_handler( f, k );
+  switch(f.dlg())
+  {
+    case F_CODCF: ok = TDocumento_mask::clifo_handler( f, k ); break;
+    case F_DATADOC: ok = data_hndl( f, k ); break;
+    default: break;
+  }
   
   if (ok && k == K_TAB && f.focusdirty())
   {    
@@ -43,15 +47,15 @@ bool TGestione_bolle_msk::lv_bolla_handler(TMask_field& f, KEY k)
     const int anno = datadoc.year();
       
     if (codcf <= 0)
-      return false;
+      return true;
 
     const long codcont = lv_find_contract(codcf,indsped,datadoc);
 
     if (stcodcf == codcf && stcodcont == codcont && nrighe > 0)
-      return false;  
+      return true;  
 
     if (codcont == 0)
-      return warning_box(TR("Non ci sono contratti in essere alla data indicata"));
+      return error_box(TR("Non ci sono contratti in essere alla data indicata"));
     
     dmsk.mask2doc();  
 
diff --git a/lv/lvbollac.src b/lv/lvbollac.src
index 508a112f3..d432aa56d 100755
--- a/lv/lvbollac.src
+++ b/lv/lvbollac.src
@@ -191,7 +191,9 @@ Col(24)=FR_TIPORIGA
 Tipo(0)=21
 
 [HANDLERS]
-// Handler(0) = F_ORAPART|1
+Handler(0) = 106|4101
+Handler(1) = 108|4101
+Handler(2) = 125|4101
 
 [PROFILOGRUPPO]
 101     = S_NASCOSTO