diff --git a/src/cg/cg2100.cpp b/src/cg/cg2100.cpp
index ef4896d3c..7bd8efcd4 100755
--- a/src/cg/cg2100.cpp
+++ b/src/cg/cg2100.cpp
@@ -111,6 +111,11 @@ TMask* TPrimanota_application::load_mask(int n)
       m->set_handler(F_SHEETIVA, iva_handler);
 	    m->show(F_LIQDIFF, _liqdiff);
 			m->set_handler(F_NUMDOCEXT, ndocext_handler);
+			if (ini_get_bool(CONFIG_STUDIO, "CG", "GesCompCR"))
+			{
+				m->show(F_DATACOMPCR);
+				m->set_handler(F_DATACOMPCR, datacompcr_handler);
+			}
 
       TSheet_field& is = m->sfield(F_SHEETIVA);
       is.set_notify(iva_notify);
@@ -191,8 +196,6 @@ TMask* TPrimanota_application::load_mask(int n)
       // Se esiste lo sheet delle rate
       if (is_fattura())
       {
-				m->set_handler(F_DATACOMPCR, datacompcr_handler);
-
         TSheet_field& ps = m->sfield(FS_RATESHEET);
 
         ps.set_notify(pag_notify);                        
diff --git a/src/cg/cg2100c.uml b/src/cg/cg2100c.uml
index 167802ba5..552dfbb43 100755
--- a/src/cg/cg2100c.uml
+++ b/src/cg/cg2100c.uml
@@ -96,7 +96,7 @@ DATE F_DATACOMPCR
 BEGIN
   PROMPT 1 3 "Data comp.c/r   "
   FIELD DATACOMPCR
-  FLAGS "G"
+  FLAGS "HG"
 END
 
 STRING F_CODCAUS 3
diff --git a/src/cg/cg5000a.h b/src/cg/cg5000a.h
index f6e36564a..e4ddd1de0 100755
--- a/src/cg/cg5000a.h
+++ b/src/cg/cg5000a.h
@@ -19,3 +19,4 @@
 #define FLD_DESAGV    119
 #define CHK_RICACQ    120
 #define CHK_NOIDRG    121
+#define CHK_02GESCOMPCR 122
\ No newline at end of file
diff --git a/src/cg/cg5000a.uml b/src/cg/cg5000a.uml
index a9691b46c..194ae2177 100755
--- a/src/cg/cg5000a.uml
+++ b/src/cg/cg5000a.uml
@@ -160,6 +160,12 @@ BEGIN
 	FIELD Cg02SN
 END
 
+BOOLEAN CHK_02GESCOMPCR
+BEGIN
+	PROMPT 3 8  "Gestione data competenza costi/ricavi"
+	FIELD GesCompCR
+END
+
 ENDPAGE
 
 ENDMASK