diff --git a/cg/Attic/cg1400.cpp b/cg/Attic/cg1400.cpp
index ac251b472..879734cfb 100755
--- a/cg/Attic/cg1400.cpp
+++ b/cg/Attic/cg1400.cpp
@@ -96,8 +96,12 @@ int TStampa_deleghe_IVA::select()
   
   _profilo = m.get(F_PROFILO);
   _codice = m.get_long(F_CODICE);
-  const bool contofis = _profilo != "DEL";
-
+  const bool contofis = _profilo.right(2) == "CF";
+  
+  int del_dis_bol=0;
+  if (_profilo.left(3) == "DIS") del_dis_bol = 2;
+  else 
+    if (_profilo.left(3) == "BOL") del_dis_bol = 1;
   //const TDate pd(m.get(F_DATA));
   //printer().setdate(pd);
   
@@ -126,6 +130,9 @@ int TStampa_deleghe_IVA::select()
     const bool cf = anag.get_bool("TITCF");
     if (contofis != cf) continue;
     
+    const int tstdel = anag.get_int("TIPOSTDEL");
+    if (tstdel != del_dis_bol) continue;
+    
     const long dit = _nditte->lfile().get_long("CODDITTA");
     chiave.format("%05ld%04d%02d%d", dit, _anno, _mese, _tipo);
     deleghe.put("CODTAB", chiave);
diff --git a/cg/Attic/cg1400a.uml b/cg/Attic/cg1400a.uml
index 731e29750..be235ad75 100755
--- a/cg/Attic/cg1400a.uml
+++ b/cg/Attic/cg1400a.uml
@@ -6,13 +6,13 @@ LIST F_PROFILO 8 16
 BEGIN
   PROMPT 1 1 "Stampa         "
   ITEM "DELIVA|Delega" 
-    MESSAGE ENABLE,F_CODICE|CLEAR,1@|ENABLE,2@|ENABLE,F_DESCR
+    MESSAGE ENABLE,3@|RESET,3@|CLEAR,1@|ENABLE,2@
   ITEM "DELIVACF|Delega C.F."   
-    MESSAGE ENABLE,F_CODICE|CLEAR,1@|ENABLE,2@|ENABLE,F_DESCR
+    MESSAGE ENABLE,3@|RESET,3@|CLEAR,1@|ENABLE,2@
   ITEM "DISIVACF|Distinta C.F." 
-    MESSAGE ENABLE,F_CODICE|CLEAR,2@|ENABLE,1@|ENABLE,F_DESCR
+    MESSAGE ENABLE,3@|RESET,3@|CLEAR,2@|ENABLE,1@
   ITEM "BOLIVACF|Bollettino C.F."
-    MESSAGE CLEAR,F_CODICE|CLEAR,2@|ENABLE,1@|DISABLE,F_DESCR
+    MESSAGE CLEAR,F_CODICE|CLEAR,2@|ENABLE,1@|CLEAR,F_DESCR
 END
 
 NUMBER F_CODICE 5
@@ -27,12 +27,14 @@ BEGIN
   OUTPUT F_CODICE CODPROF
   OUTPUT F_DESCR  DESC
   FLAGS "UZ"
+  GROUP 3
   CHECKTYPE REQUIRED
 END
 
 STRING F_DESCR 50
 BEGIN
   PROMPT 1 2 "Descrizione    "
+  GROUP 3
 END
 
 GROUPBOX DLG_NULL 70 5
diff --git a/cg/cg1400.cpp b/cg/cg1400.cpp
index ac251b472..879734cfb 100755
--- a/cg/cg1400.cpp
+++ b/cg/cg1400.cpp
@@ -96,8 +96,12 @@ int TStampa_deleghe_IVA::select()
   
   _profilo = m.get(F_PROFILO);
   _codice = m.get_long(F_CODICE);
-  const bool contofis = _profilo != "DEL";
-
+  const bool contofis = _profilo.right(2) == "CF";
+  
+  int del_dis_bol=0;
+  if (_profilo.left(3) == "DIS") del_dis_bol = 2;
+  else 
+    if (_profilo.left(3) == "BOL") del_dis_bol = 1;
   //const TDate pd(m.get(F_DATA));
   //printer().setdate(pd);
   
@@ -126,6 +130,9 @@ int TStampa_deleghe_IVA::select()
     const bool cf = anag.get_bool("TITCF");
     if (contofis != cf) continue;
     
+    const int tstdel = anag.get_int("TIPOSTDEL");
+    if (tstdel != del_dis_bol) continue;
+    
     const long dit = _nditte->lfile().get_long("CODDITTA");
     chiave.format("%05ld%04d%02d%d", dit, _anno, _mese, _tipo);
     deleghe.put("CODTAB", chiave);
diff --git a/cg/cg1400a.uml b/cg/cg1400a.uml
index 731e29750..be235ad75 100755
--- a/cg/cg1400a.uml
+++ b/cg/cg1400a.uml
@@ -6,13 +6,13 @@ LIST F_PROFILO 8 16
 BEGIN
   PROMPT 1 1 "Stampa         "
   ITEM "DELIVA|Delega" 
-    MESSAGE ENABLE,F_CODICE|CLEAR,1@|ENABLE,2@|ENABLE,F_DESCR
+    MESSAGE ENABLE,3@|RESET,3@|CLEAR,1@|ENABLE,2@
   ITEM "DELIVACF|Delega C.F."   
-    MESSAGE ENABLE,F_CODICE|CLEAR,1@|ENABLE,2@|ENABLE,F_DESCR
+    MESSAGE ENABLE,3@|RESET,3@|CLEAR,1@|ENABLE,2@
   ITEM "DISIVACF|Distinta C.F." 
-    MESSAGE ENABLE,F_CODICE|CLEAR,2@|ENABLE,1@|ENABLE,F_DESCR
+    MESSAGE ENABLE,3@|RESET,3@|CLEAR,2@|ENABLE,1@
   ITEM "BOLIVACF|Bollettino C.F."
-    MESSAGE CLEAR,F_CODICE|CLEAR,2@|ENABLE,1@|DISABLE,F_DESCR
+    MESSAGE CLEAR,F_CODICE|CLEAR,2@|ENABLE,1@|CLEAR,F_DESCR
 END
 
 NUMBER F_CODICE 5
@@ -27,12 +27,14 @@ BEGIN
   OUTPUT F_CODICE CODPROF
   OUTPUT F_DESCR  DESC
   FLAGS "UZ"
+  GROUP 3
   CHECKTYPE REQUIRED
 END
 
 STRING F_DESCR 50
 BEGIN
   PROMPT 1 2 "Descrizione    "
+  GROUP 3
 END
 
 GROUPBOX DLG_NULL 70 5