diff --git a/ve/ve0300a.src b/ve/ve0300a.src
index a83f02cc5..69ee4ab60 100755
--- a/ve/ve0300a.src
+++ b/ve/ve0300a.src
@@ -1866,10 +1866,10 @@ PROMPT="Cod.Ident.Gara "
 FIELDNAME=CIG
 USE=%CIG
 INPUT=CODTAB F_CIG
-DISPLAY="Codice@15" CODTAB~"Descrizione@50" S0
+DISPLAY="Codice@10" CODTAB~"Descrizione@50" S0
 OUTPUT=F_CIG CODTAB~F_DESCRCIG S0
 WARNING=Codice Identificativo Gara non trovato
-SIZE=15
+SIZE=10
 FLAG=U
 HELP=Inserisci il Codice Identificativo Gara
 SPECIAL=CH NORMAL
@@ -1883,7 +1883,7 @@ TYPE=T_STRINGA
 PROMPT=""
 USE=%CIG KEY 2
 INPUT=S0 F_DESCRCIG
-DISPLAY="Descrizione@50" S0~"Codice@15" CODTAB
+DISPLAY="Descrizione@50" S0~"Codice@10" CODTAB
 COPY=OU F_CIG
 SIZE=50 40
 
diff --git a/ve/velib06.cpp b/ve/velib06.cpp
index 864e84df5..dd28306f3 100755
--- a/ve/velib06.cpp
+++ b/ve/velib06.cpp
@@ -299,6 +299,7 @@ TDocumento_mask::TDocumento_mask(const char* td)
 			rp->add("%CUP", "CODTAB==" CFCMS_CUP);
 			rp->add(LF_CLIFO, "TIPOCF==TIPOCF|CODCF==CODCF");
 			bp->set_cursor(new TCursor(rp, "", 2));
+			bp->set_filter("TIPOCF==\"C\"");
 			bp->remove_input_field();
 			bp->add_input_field(TOSTRING(F_CMSH), CFCMS_COMMESSA, -1, true);
 			bp->add_input_field(TOSTRING(F_CUP), CFCMS_CUP);
@@ -315,6 +316,7 @@ TDocumento_mask::TDocumento_mask(const char* td)
 			TBrowse * bpd = efield(F_DESCRCUP).browse();
 			
 			bpd->set_cursor(new TSorted_cursor(rp, CFCMS_COMMESSA "|%CUP->S0"));
+			bpd->set_filter("TIPOCF==\"C\"");
 			bpd->remove_input_field();
 			bpd->add_input_field(TOSTRING(F_CMSH), CFCMS_COMMESSA, -1, true);
 			bpd->add_input_field(TOSTRING(F_DESCRCUP), "%CUP->S0");
@@ -331,6 +333,7 @@ TDocumento_mask::TDocumento_mask(const char* td)
 			rg->add("%CIG", "CODTAB==" CFCMS_CIG);
 			rg->add(LF_CLIFO, "TIPOCF==TIPOCF|CODCF==CODCF");
 			bg->set_cursor(new TCursor(rg, "", 3));
+			bg->set_filter("TIPOCF==\"C\"");
 			bg->remove_input_field();
 			bg->add_input_field(TOSTRING(F_CMSH), CFCMS_COMMESSA, -1, true);
 			bg->add_input_field(TOSTRING(F_CIG), CFCMS_CIG);
@@ -347,6 +350,7 @@ TDocumento_mask::TDocumento_mask(const char* td)
 			TBrowse * bgd = efield(F_DESCRCIG).browse();
 			
 			bgd->set_cursor(new TSorted_cursor(rg, CFCMS_COMMESSA "|%CIG->S0"));
+			bgd->set_filter("TIPOCF==\"C\"");
 			bgd->remove_input_field();
 			bgd->add_input_field(TOSTRING(F_CMSH), CFCMS_COMMESSA, -1, true);
 			bgd->add_input_field(TOSTRING(F_DESCRCIG), "%CIG->S0");