diff --git a/cg/cg0200.cpp b/cg/cg0200.cpp
index 2fc0a92ae..e801563d5 100755
--- a/cg/cg0200.cpp
+++ b/cg/cg0200.cpp
@@ -499,8 +499,10 @@ int TClifo_application::read(TMask& m)
       riga.add(rec.get(IND_PFAX));
       riga.add(rec.get(IND_FAX));
       riga.add(rec.get(IND_IVARID));
-      TString16 key(rec.get(IND_STATO)); key << "|" << rec.get(IND_COM);
-      const TRectype & com = cache().get(LF_COMUNI, key);
+      TString16 key; 
+      key << rec.get(IND_STATO); 
+      key << '|' << rec.get(IND_COM);
+      const TRectype& com = cache().get(LF_COMUNI, key);
       riga.add(com.get(COM_DENCOM));
       riga.add(rec.get(IND_CODIND));
 
@@ -557,7 +559,9 @@ void TClifo_application::ini2mask(TConfig& ini, TMask& m, bool query)
         riga.add(ini.get(IND_PFAX));
         riga.add(ini.get(IND_FAX));
         riga.add(ini.get(IND_IVARID));
-        TString16 key(ini.get(IND_STATO)); key << '|' << ini.get(IND_COM);
+        TString16 key; 
+        key << ini.get(IND_STATO); 
+        key << '|' << ini.get(IND_COM);
         const TRectype & com = cache().get(LF_COMUNI, key);
         riga.add(com.get(COM_DENCOM));
   
@@ -621,7 +625,7 @@ void TClifo_application::mask2ini(const TMask& m, TConfig& ini)
       ini.set(IND_CIV,row.get());
       ini.set(IND_LOCALITA,row.get());
       ini.set(IND_CAP,row.get());
-      ini.set(IND_STATO,row.get_int());
+      ini.set(IND_STATO,row.get());
       ini.set(IND_COM,row.get());
       ini.set(IND_PTEL,row.get());
       ini.set(IND_TEL,row.get());
@@ -736,7 +740,7 @@ void TClifo_application::common_f(const TMask& m)
       rec.put(IND_CIV,row.get());
       rec.put(IND_LOCALITA,row.get());
       rec.put(IND_CAP,row.get());
-      rec.put(IND_STATO,row.get_int());
+      rec.put(IND_STATO,row.get());
       rec.put(IND_COM,row.get());
       rec.put(IND_PTEL,row.get());
       rec.put(IND_TEL,row.get());
diff --git a/cg/cg0200b.uml b/cg/cg0200b.uml
index 712e26162..9e17b5c5c 100755
--- a/cg/cg0200b.uml
+++ b/cg/cg0200b.uml
@@ -40,7 +40,7 @@ END
 NUMBER F_STATOI 3
 BEGIN
 PROMPT 1 6 "Stato     "
-FLAGS "RZ"
+FLAGS "Z"
 USE %STA
 INPUT CODTAB F_STATOI
 DISPLAY "Codice" CODTAB
@@ -57,8 +57,8 @@ BEGIN
 PROMPT 18 6 "Comune "
 FLAGS "U"
 USE LF_COMUNI
-INPUT STATO 106
-INPUT COM 107
+INPUT STATO F_STATOI
+INPUT COM F_COMI
 DISPLAY "Stato" STATO
 DISPLAY "Codice" COM
 DISPLAY "Comune@50" DENCOM
diff --git a/cg/cg0500a.uml b/cg/cg0500a.uml
index f00846d07..e51c334ed 100755
--- a/cg/cg0500a.uml
+++ b/cg/cg0500a.uml
@@ -159,6 +159,8 @@ BEGIN
   PROMPT 2 5 "Tipo movimento        "
   FIELD TIPOMOV
   ITEM " |Nessuno"            MESSAGE COPY,F_TIPO_MOV
+  ITEM "1|Fattura"            MESSAGE COPY,F_TIPO_MOV
+  ITEM "2|Nota credito"       MESSAGE COPY,F_TIPO_MOV
   ITEM "3|Incasso/pagamento " MESSAGE COPY,F_TIPO_MOV
   ITEM "5|Insoluto"           MESSAGE COPY,F_TIPO_MOV
   ITEM "6|Pagamento insoluto" MESSAGE COPY,F_TIPO_MOV
diff --git a/cg/cg2100.cpp b/cg/cg2100.cpp
index d916ea5a6..39787637c 100755
--- a/cg/cg2100.cpp
+++ b/cg/cg2100.cpp
@@ -24,12 +24,12 @@ class TDati_incasso : public TObject
 {              
 public:       
   int _step;
-  TString _causale;
+  TString4 _causale;
   TBill _clifo;
   TDate _datadoc;
-  TString _numdoc;
+  TString8 _numdoc;
   real _totale;
-  TString _causale_fattura;
+  TString4 _causale_fattura;
   TipoIVA _iva_fattura;
 };
 
@@ -60,8 +60,6 @@ TMask* TPrimanota_application::load_mask(int n)
       m->set_handler(F_NUMREG,   num_handler);
       m->set_handler(F_CODCAUS,  caus_query_handler);
       m->set_handler(F_DATAREG,  datareg_handler); 
-      // DATACOMP new way
-      // m->set_handler(F_DATACOMP, datacomp_handler);
 
       TConfig c(CONFIG_STUDIO, "cg");  
 
@@ -221,13 +219,11 @@ bool TPrimanota_application::user_create()
   return TRUE;
 }
 
-
 bool TPrimanota_application::save_and_new() const
 { 
   return _savenew || _incasso->_step == 1; 
 }
 
-
 bool TPrimanota_application::user_destroy()
 { 
   for (int m = 3; m >= 0; m--)
diff --git a/cg/f16.trr b/cg/f16.trr
index d51ac7c5e..28352138e 100755
--- a/cg/f16.trr
+++ b/cg/f16.trr
@@ -8,7 +8,7 @@ INDIR|1|35|0|Indirizzo
 CIV|1|10|0|Numero civico
 LOCALITA|1|35|0|Localita'
 CAP|1|5|0|CAP
-STATO|2|3|0|Codice stato
+STATO|1|3|0|Codice stato
 COM|1|4|0|Codice comune
 PTEL|1|10|0|Prefisso del numero di telefono
 TEL|1|30|0|Numero di telefono