diff --git a/cg/cg2100.cpp b/cg/cg2100.cpp
index 7c34012cb..9a12c923d 100755
--- a/cg/cg2100.cpp
+++ b/cg/cg2100.cpp
@@ -647,7 +647,11 @@ void TPrimanota_application::fill_sheet(TMask& m) const
   {
     TSheet_field& cgs = (TSheet_field&)m.fld(cgpos);
     for (int r = cgs.items(); r < filler; r++) 
-      cgs.row(r);
+		{
+			cgs.row(r);
+			cgs.check_row(r);
+		}
+
   }
   
   if (ivpos > 0)
@@ -944,8 +948,10 @@ int TPrimanota_application::read(TMask& m)
 
     const char tipo = r.get_char(RMV_ROWTYPE);         
     riga.add(tipo, CG_ROWTYPE-FIRST_FIELD);      // Tipo di riga 115
-    
+		riga.add(r.get(RMV_CUP), cgs().cid2index(CG_CUP));
+		riga.add(r.get(RMV_CIG), cgs().cid2index(CG_CIG));    
     disable_cgs_cells(i, tipo);
+		cgs().check_row(i);
   }      
 
   if (_iva == nessuna_iva && is_fattura()) // Ci dovrebbero essere delle scadenze
@@ -1092,6 +1098,8 @@ void TPrimanota_application::mask2rel(const TMask& m)
       r.put(RMV_SOTTOCONTOC, row.get());
       row.get();                              // Descrizione contropartita
       r.put(RMV_ROWTYPE, row.get(CG_ROWTYPE-FIRST_FIELD));  // Tipo riga
+      r.put(RMV_CUP, row.get());  // CUP
+      r.put(RMV_CIG, row.get());  // CIG
     }
   }
 
@@ -1803,6 +1811,8 @@ void TPrimanota_application::ini2mask(TConfig& ini, TMask& msk, bool query)
       
       
       riga.add(tipo, cg.cid2index(CG_ROWTYPE));    // Tipo di riga 115
+      riga.add(ini.get(RMV_CUP), cg.cid2index(CG_CUP));    // CUP
+      riga.add(ini.get(RMV_CIG), cg.cid2index(CG_CIG));    // CIG
     }    
     
     if (is_fattura())
diff --git a/cg/cg2100.h b/cg/cg2100.h
index 767a51e65..99f798570 100755
--- a/cg/cg2100.h
+++ b/cg/cg2100.h
@@ -82,6 +82,10 @@
 #define CG_SOTTOCONTO 106
 #define CG_DESCR      109
 #define CG_ROWTYPE    115
+#define CG_CUP				116
+#define CG_DCUP				117
+#define CG_CIG				118
+#define CG_DCIG				119
 #define CG_MASTRINO   195
 #define CG_RATEO      196
 #define CG_RISCONTO   197
diff --git a/cg/cg2100b.uml b/cg/cg2100b.uml
index 2f74261a9..70b4b9ce6 100755
--- a/cg/cg2100b.uml
+++ b/cg/cg2100b.uml
@@ -389,6 +389,10 @@ BEGIN
   ITEM "Sott./c@6"
   ITEM "Descrizione contropartita@30"
   ITEM "Tipo@4"
+  ITEM "CUP@15"
+  ITEM "Descrizione CUP@50"
+  ITEM "CIG@10"
+  ITEM "Descrizione CIG@50"
 END
 
 NUMBER F_GRUPPO 3
diff --git a/cg/cg2100c.uml b/cg/cg2100c.uml
index 3e32401ea..e2b1ffdb3 100755
--- a/cg/cg2100c.uml
+++ b/cg/cg2100c.uml
@@ -708,6 +708,10 @@ BEGIN
   ITEM "Sott./c@6"
   ITEM "Descrizione contropartita@30"
   ITEM "Tipo@4"
+  ITEM "CUP@15"
+  ITEM "Descrizione CUP@50"
+  ITEM "CIG@10"
+  ITEM "Descrizione CIG@50"  
 END
 
 NUMBER F_GRUPPO 3
diff --git a/cg/cg2102.cpp b/cg/cg2102.cpp
index f72cf4e9d..0fe55b4a5 100755
--- a/cg/cg2102.cpp
+++ b/cg/cg2102.cpp
@@ -1098,6 +1098,7 @@ bool TPrimanota_application::cg_notify(TSheet_field& cg, int r, KEY k)
         a.calcola_saldo();
       }
     }    
+		cg.check_row(r);
     break;
   default:
     break;
diff --git a/cg/cg21cg.uml b/cg/cg21cg.uml
index b264bc5ff..bc742e848 100755
--- a/cg/cg21cg.uml
+++ b/cg/cg21cg.uml
@@ -1,4 +1,4 @@
-PAGE "RIGA PRIMA NOTA" -1 -1 67 15
+PAGE "RIGA PRIMA NOTA" -1 -1 67 17
 
 GROUPBOX DLG_NULL 66 3
 BEGIN
@@ -50,11 +50,11 @@ BEGIN
   FIELD TIPOC
   FLAGS "GU"
   ITEM " |Conto"
-  MESSAGE SHOW,106|HIDE,206|HIDE,306|SHOW,107|HIDE,207|HIDE,307
+  MESSAGE SHOW,106|HIDE,206|HIDE,306|SHOW,107|HIDE,207|HIDE,307|CLEAR,64@
   ITEM "C|Cliente"
-  MESSAGE SHOW,206|HIDE,106|HIDE,306|SHOW,207|HIDE,107|HIDE,307
+  MESSAGE SHOW,206|HIDE,106|HIDE,306|SHOW,207|HIDE,107|HIDE,307|ENABLE,64@
   ITEM "F|Fornitore"
-  MESSAGE SHOW,306|HIDE,106|HIDE,206|SHOW,307|HIDE,107|HIDE,207
+  MESSAGE SHOW,306|HIDE,106|HIDE,206|SHOW,307|HIDE,107|HIDE,207|ENABLE,64@
 END
 
 NUMBER CG_GRUPPO 3
@@ -318,9 +318,60 @@ BEGIN
   WARNING "Fornitore inesistente sulla riga contabile"
 END     
 
+STRING CG_CUP 22
+BEGIN
+  PROMPT 1 11 "CUP      "
+  USE %CUP
+  INPUT CODTAB CG_CUP
+  DISPLAY "Codice@22" CODTAB
+  DISPLAY "Descrizione@50" S0
+  OUTPUT CG_CUP CODTAB
+  OUTPUT CG_DCUP S0
+  FIELD CUP
+  CHECKTYPE NORMAL
+  GROUP 64
+END
+
+STRING CG_DCUP 50 30
+BEGIN
+  PROMPT 40 11 ""
+  USE %CUP KEY 2
+  INPUT S0 F_DCUP
+  DISPLAY "Descrizione@50" S0
+  DISPLAY "Codice@22" CODTAB
+  COPY OUTPUT CG_CUP
+  GROUP 64
+END
+
+STRING CG_CIG 10
+BEGIN
+  PROMPT 1 12 "CIG      "
+  USE %CIG
+  INPUT CODTAB CG_CIG
+  DISPLAY "Codice@10" CODTAB
+  DISPLAY "Descrizione@50" S0
+  DISPLAY "Codice gara" S1
+  OUTPUT CG_CIG CODTAB
+  OUTPUT CG_DCIG S0
+  FIELD CIG
+  CHECKTYPE NORMAL
+  GROUP 64
+END
+
+STRING CG_DCIG 50 30
+BEGIN
+  PROMPT 40 12 ""
+  USE %CIG KEY 2
+  INPUT S0 CG_DCIG
+  DISPLAY "Descrizione@50" S0
+  DISPLAY "Codice@10" CODTAB
+  COPY OUTPUT CG_CIG
+  GROUP 64
+END
+
 LIST CG_ROWTYPE 24
 BEGIN
-  PROMPT 28 12 "Tipo riga "
+  PROMPT 28 13 "Tipo riga "
   ITEM " |Sola contabilità"
   ITEM "A|Abbuoni attivi"
   ITEM "C|Differenza cambi"
diff --git a/cg/f24.dir b/cg/f24.dir
index 746d6dea3..5b0662f69 100755
--- a/cg/f24.dir
+++ b/cg/f24.dir
@@ -1,3 +1,3 @@
 24
 0
-$rmov|0|0|159|0|Righe di movimento contabile|NMOV*3||
+$rmov|0|0|184|0|Righe di movimento contabile|NMOV*3||
diff --git a/cg/f24.trr b/cg/f24.trr
index 4fdea8baa..d22205f58 100755
--- a/cg/f24.trr
+++ b/cg/f24.trr
@@ -1,5 +1,5 @@
 24
-20
+22
 ANNOES|9|4|0|Codice esercizio
 NUMREG|3|7|0|Numero di operazione
 NUMRIG|2|3|0|Numero di riga
@@ -20,6 +20,8 @@ ROWTYPE|1|1|0|
 NUMGIO|3|7|0|
 CODCMS|1|20|0|Codice Commessa
 FASCMS|1|10|0|Fase Commessa
+CUP|1|15|0|Codice Unico di Progetto
+CIG|1|10|0|Codice Identificativo di Gara
 2
 NUMREG+NUMRIG| 
 GRUPPO+CONTO+SOTTOCONTO+DATAREG+NUMREG+NUMRIG|