diff --git a/src/mr/mr0600.cpp b/src/mr/mr0600.cpp
index d1362d0f1..641f8710e 100644
--- a/src/mr/mr0600.cpp
+++ b/src/mr/mr0600.cpp
@@ -120,9 +120,9 @@ const TString TCampass_app::zeroFill(TString val, int n) const
 bool TCampass_app::setParameters(TString dsn, TString utente, TString password)
 {
 	// Salvo i parametri
-	ini_set_string(CONFIG_DITTA, "Campo_MSSQL_Export", "DSN", dsn);
-	ini_set_string(CONFIG_DITTA, "Campo_MSSQL_Export", "User", utente);
-	ini_set_string(CONFIG_DITTA, "Campo_MSSQL_Export", "Password", password);
+	ini_set_string(CONFIG_DITTA, "Campo_Compass", "DSN", dsn);
+	ini_set_string(CONFIG_DITTA, "Campo_Compass", "User", utente);
+	ini_set_string(CONFIG_DITTA, "Campo_Compass", "Password", password);
 	DSN = dsn;
 	usr = utente;
 	psw = password;
@@ -442,7 +442,11 @@ bool TCampass_app::o01a(const TString id) const
 					sqlQuery << "',NULL,'";
 					
 					// Se non ho un codice magazzino metto lo standard, Roberto ha detto di metterlo a mano tanto non cambierà mai!
-					sqlQuery << rowRDoc.get("CODMAG") == "" ? "001" :  rowRDoc.get("CODMAG");
+					TString mag(rowRDoc.get("CODMAG"));
+					if(mag.full())
+						sqlQuery << mag;
+					else
+						sqlQuery << "001";
 
 					sqlQuery << "','" << rowDoc.get_date("DATADOC").date2ansi() << "','" << rowRDoc.get_date("DATACONS").date2ansi() << "','" << zeroFill(rowRDoc.get("QTA")) << "',";
 					
@@ -502,15 +506,15 @@ bool TCampass_app::o01e(const TString id) const
 				TString sqlQuery;
 				TString codagg; codagg << rowFiltro.get("CODAGG1");
 				// Inserisco IIKRUNIMP, FAZI, CStr, CPRD, CART
-				sqlQuery << "INSERT INTO O01E ( IKRUNIMP, CPRD, CPARAM, CPARVAL ) \
-										VALUES('" << id << "','" << zeroFill(rowRDoc.get("NDOC")) << "." << rowRDoc.get("NRIGA") << "','TONING','" << codagg.sub(0,5) << "');";
-				sqlQuery << "INSERT INTO O01E ( IKRUNIMP, CPRD, CPARAM, CPARVAL ) \
-										VALUES('" << id << "','" << zeroFill(rowRDoc.get("NDOC")) << "." << rowRDoc.get("NRIGA") << "','CALING','" << codagg.sub(6) << "');";
+				sqlQuery << "INSERT INTO O01E ( IKRUNIMP, CSTR, CPRD, CPARAM, CPARVAL ) \
+										VALUES('" << id << "','DBS','" << zeroFill(rowRDoc.get("NDOC")) << "." << rowRDoc.get("NRIGA") << "','TONING','" << codagg.sub(0,5) << "');";
+				sqlQuery << "INSERT INTO O01E ( IKRUNIMP, CSTR, CPRD, CPARAM, CPARVAL ) \
+										VALUES('" << id << "','DBS','" << zeroFill(rowRDoc.get("NDOC")) << "." << rowRDoc.get("NRIGA") << "','CALING','" << codagg.sub(6) << "');";
 				codagg = rowFiltro.get("CODAGG2");
-				sqlQuery << "INSERT INTO O01E ( IKRUNIMP, CPRD, CPARAM, CPARVAL ) \
-										VALUES('" << id << "','" << zeroFill(rowRDoc.get("NDOC")) << "." << rowRDoc.get("NRIGA") << "','TONUSC','" << codagg.sub(0,5) << "');";
-				sqlQuery << "INSERT INTO O01E ( IKRUNIMP, CPRD, CPARAM, CPARVAL ) \
-										VALUES('" << id << "','" << zeroFill(rowRDoc.get("NDOC")) << "." << rowRDoc.get("NRIGA") << "','CALUSC','" << codagg.sub(6) << "');";
+				sqlQuery << "INSERT INTO O01E ( IKRUNIMP, CSTR, CPRD, CPARAM, CPARVAL ) \
+										VALUES('" << id << "','DBS','" << zeroFill(rowRDoc.get("NDOC")) << "." << rowRDoc.get("NRIGA") << "','TONUSC','" << codagg.sub(0,5) << "');";
+				sqlQuery << "INSERT INTO O01E ( IKRUNIMP, CSTR, CPRD, CPARAM, CPARVAL ) \
+										VALUES('" << id << "','DBS','" << zeroFill(rowRDoc.get("NDOC")) << "." << rowRDoc.get("NRIGA") << "','CALUSC','" << codagg.sub(6) << "');";
 				if(sqlset.exec(sqlQuery) != 1)
 				{
 					message_box(sqlQuery);
@@ -619,7 +623,7 @@ bool TCampass_app::o02c(const TString CodNum, const TString id) const
 
 				// Inserisco Tutto (yeeeeeeeeeeeeeee)
 				sqlQuery << "INSERT INTO O02C ( IKRUNIMP, CStr, CPRD, CCLIH, CCLIR, BVAL) \
-										VALUES('" << id << "','DBS','" << zeroFill(rowRDoc.get("NDOC")) << "." << rowRDoc.get("NRIGA") << "','" << rowRDoc.get("ANNO") << "." << CodNum << zeroFill(rowRDoc.get("DANDOC")) << "','" << rowRDoc.get("DAIDRIGA") << "','1');";
+										VALUES('" << id << "','DBS','" << zeroFill(rowRDoc.get("NDOC")) << "." << rowRDoc.get("NRIGA") << "','" << rowRDoc.get("ANNO") << "." << CodNum << "." << zeroFill(rowRDoc.get("DANDOC")) << "','" << rowRDoc.get("DAIDRIGA") << "','1');";
 
 				if(sqlset.exec(sqlQuery) != 1)
 				{