diff --git a/cg/cg0100a.uml b/cg/cg0100a.uml
index 00b731ea9..43b241753 100755
--- a/cg/cg0100a.uml
+++ b/cg/cg0100a.uml
@@ -371,6 +371,7 @@ END
 STRING FLD_CM1_DESCIVACOMP 50 38
 BEGIN
   PROMPT 36 13 ""
+  GROUP 1 2
   USE %IVA KEY 2
   INPUT S0 FLD_CM1_DESCIVACOMP
   DISPLAY "Descrizione@50" S0
diff --git a/cg/cg0200a.uml b/cg/cg0200a.uml
index c54c49d17..e3091319a 100755
--- a/cg/cg0200a.uml
+++ b/cg/cg0200a.uml
@@ -114,7 +114,6 @@ STRING F_STATOPAIV 2
 BEGIN
   PROMPT 42 4 "Stato CEE    "
   FIELD STATOPAIV
-//  KEY 5
   HELP "Codice ISO dello stato"
   FLAGS "U"
   USE %SCE
@@ -1605,6 +1604,8 @@ BEGIN
   DISPLAY "Codice categoria" CODTAB
   DISPLAY "Descrizione@30" S0
   OUTPUT F_CATFIN CODTAB
+  CHECKTYPE NORMAL
+  FLAGS "U" 
   HELP "Codice della categoria finanziaria"
 END
 
diff --git a/cg/cg1301.cpp b/cg/cg1301.cpp
index 2f6eb8230..21451d7f6 100755
--- a/cg/cg1301.cpp
+++ b/cg/cg1301.cpp
@@ -1,6 +1,11 @@
 //**************************************************
 //* Aggiornamento Flag Operazioni Intracomunitarie *
 //**************************************************
+#include <mask.h>
+#include <progind.h>
+#include <relation.h>
+#include <urldefid.h>
+
 #include <mov.h>  
 #include <rmoviva.h>
 #include <causali.h>
diff --git a/cg/cg1301.h b/cg/cg1301.h
index 80de6ace5..aafd8256b 100755
--- a/cg/cg1301.h
+++ b/cg/cg1301.h
@@ -1,11 +1,5 @@
-#include <applicat.h> 
-#include <mask.h>
-#include <relation.h>
-#include <tabutil.h>
-#include <utility.h>
-#include <progind.h>
-#include <urldefid.h>
-#include <prefix.h>   
+#include <applicat.h>
+#include <isam.h>  
 
 class TAgg_opintra : public TApplication
 {
diff --git a/cg/cg1302.cpp b/cg/cg1302.cpp
index 60694fe43..384cc0031 100755
--- a/cg/cg1302.cpp
+++ b/cg/cg1302.cpp
@@ -1,8 +1,8 @@
 //****************************
 //* Aggiornamento Tipo Conto *
 //****************************
-
-#include <recarray.h>  
+#include <mask.h>
+#include <recarray.h> 
 
 #include <mov.h>  
 #include <rmoviva.h>
diff --git a/cg/cg1302.h b/cg/cg1302.h
index 7163c6806..a8b73a8d9 100755
--- a/cg/cg1302.h
+++ b/cg/cg1302.h
@@ -1,10 +1,4 @@
-#include <printapp.h> 
-#include <mask.h>
-#include <tabutil.h>
-#include <utility.h>
-#include <progind.h>
-#include <urldefid.h>
-#include <prefix.h>   
+#include <printapp.h>   
 
 class TAgg_tconto : public TPrintapp
 {
diff --git a/cg/cg1304.cpp b/cg/cg1304.cpp
index d1e5de2af..31f28c682 100755
--- a/cg/cg1304.cpp
+++ b/cg/cg1304.cpp
@@ -1,6 +1,9 @@
 //*****************************************************
 //* Aggiornamento codice attivita' su progressivi IVA *
 //*****************************************************
+#include <mask.h>
+#include <progind.h>
+#include <tabutil.h>
 
 #include <mov.h>
 
diff --git a/cg/cg1304.h b/cg/cg1304.h
index 4909479d9..816bde62a 100755
--- a/cg/cg1304.h
+++ b/cg/cg1304.h
@@ -1,11 +1,4 @@
 #include <applicat.h> 
-#include <mask.h>
-#include <relation.h>
-#include <tabutil.h>
-#include <utility.h>
-#include <progind.h>
-#include <urldefid.h> 
-#include <config.h> 
 
 class TAgg_codatt : public TSkeleton_application
 {
diff --git a/cg/cg1305.h b/cg/cg1305.h
index 19a700287..9808a9508 100755
--- a/cg/cg1305.h
+++ b/cg/cg1305.h
@@ -1,5 +1,4 @@
 #include <applicat.h> 
-#include <isam.h>
 
 class TAgg_codes : public TSkeleton_application
 {
diff --git a/cg/cg1306.cpp b/cg/cg1306.cpp
index 3fda9d3af..8fb4eb253 100755
--- a/cg/cg1306.cpp
+++ b/cg/cg1306.cpp
@@ -1,5 +1,8 @@
 // sistema la data di competenza di tutti i movimenti
 
+#include <isam.h>
+#include <progind.h>
+
 #include "cg1300.h"
 #include "cg1306.h"
 
diff --git a/cg/cg1306.h b/cg/cg1306.h
index f555669b0..667e46d4b 100755
--- a/cg/cg1306.h
+++ b/cg/cg1306.h
@@ -1,9 +1,4 @@
 #include <applicat.h> 
-#include <mask.h>
-#include <isam.h>
-#include <utility.h>
-#include <progind.h>
-#include <urldefid.h> 
 
 class TAgg_datacomp : public TSkeleton_application
 {
diff --git a/cg/cg3100.cpp b/cg/cg3100.cpp
index d584dc574..849a367bb 100755
--- a/cg/cg3100.cpp
+++ b/cg/cg3100.cpp
@@ -1413,8 +1413,8 @@ break;
       set_row(rr++, FR("@bTotali Fornitore@18gDocumenti Totale documenti@49gAllegati:@63gImponibile@82gImposta@95gop. esenti@110gop. non imp."));
     set_row(rr, "@b@18g%9d", _documenti);
     set_row(rr, "@b@28g%r",  &_totdocumenti);
-    set_row(rr, "@b@56g%r",  &_totimponibile);
-    set_row(rr, "@b@74g%r",  &_totimposta);
+    set_row(rr, "@b@57g%r",  &_totimponibile);
+    set_row(rr, "@b@73g%r",  &_totimposta);
     set_row(rr, "@b@92g%r",  &_op_esenti);
     set_row(rr, "@b@110g%r", &_op_non_imp);          
     _totimposta    = 0;