diff --git a/src/ve/velib.h b/src/ve/velib.h
index d7f7fcc38..772ee7d2b 100755
--- a/src/ve/velib.h
+++ b/src/ve/velib.h
@@ -24,13 +24,13 @@ class TViswin;
 #ifndef __CLIFOR_H
 #include "../ve/clifor.h"
 #endif
-              
+
 #ifndef __VERIG_H
 #include "../ve/verig.h"
 #endif
 
-#ifndef __CGLIB01_H
-#include "../cg/cglib01.h"
+#ifndef __CGLIB_H
+#include "../cg/cglib.h"
 #endif
                           
 							
diff --git a/src/ve/velib02.cpp b/src/ve/velib02.cpp
index 62ecf7902..2886f6d63 100755
--- a/src/ve/velib02.cpp
+++ b/src/ve/velib02.cpp
@@ -177,17 +177,7 @@ TRiga_documento::TRiga_documento(const TRiga_documento & row)
 	set_memo_fld("RG1");
   copy(row);
 }
-
-/* Maialata inguardabile: guai a chi la riporta!
-TRiga_documento::TRiga_documento(const TRiga_documento& rec, TDocumento* doc,
-                                 const char * tipo)
-               : TAuto_variable_rectype(rec), _doc(doc)
-{
-	set_memo_fld("RG1");
-  if (tipo)
-    set_tipo(tipo);
-}*/
-                  
+                
 const TTipo_riga_documento& TRiga_documento::tipo(const char * tiporiga)
 {
   CHECK(tiporiga && *tiporiga, "Tipo riga documento nullo");
diff --git a/src/ve/velib04b.cpp b/src/ve/velib04b.cpp
index c1972e999..6312255b1 100755
--- a/src/ve/velib04b.cpp
+++ b/src/ve/velib04b.cpp
@@ -1,7 +1,6 @@
 #include "velib04.h"
 #include "../ca/calib01.h"
-#include "../cg/cg2103.h"
-#include "../cg/cglib02.h"
+#include "../cg/cglib.h"
 #include "../cg/cgsaldac.h"
 #include "../in/inlib01.h"
 
diff --git a/src/ve/velib04f.cpp b/src/ve/velib04f.cpp
index bcde0a83f..e06b96b51 100755
--- a/src/ve/velib04f.cpp
+++ b/src/ve/velib04f.cpp
@@ -7,7 +7,7 @@
 #include "../ca/rmovana.h"
 #include "../ca/rrip.h"
 #include "../cg/cg2101.h"
-#include "../cg/cg2103.h"
+#include "../cg/cglib.h"
 #include "../mg/anamag.h"
 
 ///////////////////////////////////////////////////////////
diff --git a/src/ve/velib05.cpp b/src/ve/velib05.cpp
index 84f616594..ae58797c1 100755
--- a/src/ve/velib05.cpp
+++ b/src/ve/velib05.cpp
@@ -3,7 +3,7 @@
 #include <diction.h>
 #include <utility.h>
 
-#include "../cg/cglib03.h"
+#include "../cg/cglib.h"
 
 #include <causali.h>
 
diff --git a/src/ve/velib06a.cpp b/src/ve/velib06a.cpp
index a65f099d2..10a4e5393 100755
--- a/src/ve/velib06a.cpp
+++ b/src/ve/velib06a.cpp
@@ -21,8 +21,7 @@
 #include "velib07.h"
 #include "ve0100n.h"
 
-#include "../cg/cg2103.h"
-#include "../cg/cglib03.h"
+#include "../cg/cglib.h"
 #include "../db/dblib.h"             
 #include "../mg/mglib.h"
 #include "../db/dblib.h"
@@ -3080,9 +3079,10 @@ bool codcms_handler(TMask_field& f, KEY key)
 		} //if (main_app().has_module(CTAUT) && (...
 
     //aggiornamento automatico del campo codice contabilita' separata nel caso di commessa che ce lo abbia
-    if (main_app().has_module(NPAUT) && (key == K_TAB && f.focusdirty()))
+    if (main_app().has_module(NPAUT) && f.running_check(key))
 		{
       const TString& contsep = cache().get(LF_COMMESSE, codcms, COMMESSE_CONTSEP);
+
       mask.set(F_CONTSEP, contsep);
     }
 	}
diff --git a/src/ve/velib07.cpp b/src/ve/velib07.cpp
index 2566714c8..b728c97ed 100755
--- a/src/ve/velib07.cpp
+++ b/src/ve/velib07.cpp
@@ -1,7 +1,7 @@
 #include "velib07.h"
 
 #include "../cg/cgsaldac.h"
-#include "../cg/cglib02.h"
+#include "../cg/cglib.h"
 #include "../db/dblib.h"
 
 #include <pconti.h>
@@ -817,7 +817,7 @@ static real calcola_saldo_contabile(const char tipocf, const long codcf, const T
     const int indbil = row->get_int(2);
 
     TSaldo saldo;
-    real saldo_periodo = saldo.saldo_periodo(gruppo, conto, codcf, datainies, datacalc, indbil, false);
+    real saldo_periodo = saldo.saldo_periodo(Competenza, gruppo, conto, codcf, datainies, datacalc, indbil, false);
 
     saldone += saldo_periodo;
   }