diff --git a/ve/velib02.cpp b/ve/velib02.cpp
index 4de2e9db6..454c1ad05 100755
--- a/ve/velib02.cpp
+++ b/ve/velib02.cpp
@@ -1334,16 +1334,14 @@ void TRiga_documento::autoload(TSheet_field & f)
 	for (short id = FR_JOLLY1;  id <= FR_JOLLY10; id++)
   {
 		const int pos = m.id2pos(id);
-
 		if (pos > 0)
 		{
 	    const TFieldref* fld = m.fld(pos).field();
 
 			if (fld != NULL)
 			{
-					const int idx = f.cid2index(id);
-
-					row.add(fld->read(*this), idx);
+			  const int idx = f.cid2index(id);
+				row.add(fld->read(*this), idx);
 			}
 		}
 	}
@@ -1351,30 +1349,25 @@ void TRiga_documento::autoload(TSheet_field & f)
 	for (short id = FR_SCAACC;  id <= FR_PUNVET; id++)
   {
 		const int pos = m.id2pos(id);
-
 		if (pos > 0)
 		{
 	    const TFieldref* fld = m.fld(pos).field();
-
 			if (fld != NULL)
 			{
 				const int idx = f.cid2index(id);
-
 				row.add(fld->read(*this), idx);
 			}
 		}
 	}
+
+  row.pack();
 }
 
-TArticolo & TRiga_documento::articolo() const
-{                
-  return cached_article(get(RDOC_CODARTMAG));     
-}
+TArticolo& TRiga_documento::articolo() const
+{ return cached_article(get(RDOC_CODARTMAG)); }
 
-TArticolo_giacenza & TRiga_documento::articolo_giacenza() const
-{                
-  return cached_article_balances(get(RDOC_CODARTMAG));     
-}
+TArticolo_giacenza& TRiga_documento::articolo_giacenza() const
+{ return cached_article_balances(get(RDOC_CODARTMAG)); }
 
 const TToken_string & TRiga_documento::get_original_rdoc_key() const
 {
@@ -1389,8 +1382,7 @@ const TToken_string & TRiga_documento::get_original_rdoc_key() const
 
 const TToken_string & TRiga_documento::get_rdoc_key() const
 {
-	TToken_string & key = get_tmp_string(32);
-
+	TToken_string& key = get_tmp_string(32);
   key.add(get(RDOC_CODNUM));
   key.add(get(RDOC_ANNO));
   key.add(get(RDOC_PROVV));
diff --git a/ve/velib06.cpp b/ve/velib06.cpp
index 0fbd446bd..62eb51966 100755
--- a/ve/velib06.cpp
+++ b/ve/velib06.cpp
@@ -1635,7 +1635,7 @@ bool TDocumento_mask::ss_notify( TSheet_field& ss, int r, KEY key )
         }
       }
 			if (s.full())
-				riga.put("CODMAG", s);
+				riga.put(RDOC_CODMAG, s);
 
       riga.autoload(ss);
       ss.check_row(r);			
@@ -1664,13 +1664,8 @@ bool TDocumento_mask::ss_notify( TSheet_field& ss, int r, KEY key )
 		break;
 	case K_CTRL + K_TAB: // uscita dalla riga
 		{
+	    static const bool checkgiac = ini_get_bool(CONFIG_DITTA, "ve", "LIVPERART");
 			bool ok = true;
-	    static int checkgiac = 3;
-			if (checkgiac > 2)
-	    {
-	      TConfig c(CONFIG_DITTA);
-				checkgiac = c.get_bool("LIVPERART", "ve");
-	    }
 			if (checkgiac)
 			{
 				TString livello;