diff --git a/ci/ci0400.cpp b/ci/ci0400.cpp
index 1260e5011..cc881c681 100755
--- a/ci/ci0400.cpp
+++ b/ci/ci0400.cpp
@@ -23,31 +23,23 @@
 void TImmissioneDocumenti_app::init_tabs()
 {
 	TImmissioneDocumenti_mask & m = mask();
-  TToken_string pagenames;
-	const short id = F_AL01;
-  int items = 0;
-
+  
   m.filters().destroy();
 	m.ordered().reset();
 
-  pagenames = "";
+  TConfig configfile(CONFIG_DITTA, "ci");
+	int items = 0;
+  TToken_string pagenames;
 
-  TConfig configfile("ci0400.ini");
-  configfile.set_paragraph("Main");
-
-  while (configfile.exist("Descr",items))
+	while (items == 0 || configfile.exist("Descr",items))
   {
-    pagenames.add(configfile.get("Descr","Main",items));
-    m.filters().add(configfile.get("Filter","Main",items));
-    m.activate_almanac(id +	items, items, TDate(TODAY));
+    pagenames.add(configfile.get("Descr", NULL,items, "Fatture"));
+    m.filters().add(configfile.get("Filter", NULL,items, "F01"));
+    m.activate_almanac(F_AL01 +	items, items, TDate(TODAY));
     items++;
   }
-
-  if (items > 0)
-  {
-    m.set_caption(pagenames);
-    m.disable_page(items);
-  }
+  m.set_caption(pagenames);
+  m.disable_page(items);
 }
 
 void TImmissioneDocumenti_app::init_flags()
@@ -148,7 +140,8 @@ void TImmissioneDocumenti_mask::open_day_mask(TDate date)
   relation.add(LF_CLIFO, "TIPOCF==TIPOCF|CODCF==CODCF");
 
   TCursor cursor(&relation, filter);
-
+	if (!almanac().can_insert(date) && is_date_void(currpage, date))
+		return;
   TCursor_sheet sheet(&cursor, 
     "ANNO|CODNUM|TIPODOC|NUMDOCRIF|STATO|DATADOCRIF|NDOC|20->RAGSOC", 
     TR("Selezione documenti"), 
@@ -196,7 +189,7 @@ void TImmissioneDocumenti_mask::call_ve0(int exitval, TRelation& relation, TDate
 {
   TFilename tempfile;
   tempfile.tempdir();
-  tempfile.add("cicallsve0.ini");
+  tempfile.add("ci.ini");
 
   {
     TConfig configfile(tempfile);
diff --git a/ci/ci0400.ini b/ci/ci0400.ini
deleted file mode 100755
index 02d492b20..000000000
--- a/ci/ci0400.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[Main]
-Filter(0) = F01
-Filter(1) = B01
-Descr(0) = Fatture
-Descr(1) = Bolle
-