diff --git a/src/mr/mr0600.cpp b/src/mr/mr0600.cpp
index db90cceb1..f11c00e2c 100644
--- a/src/mr/mr0600.cpp
+++ b/src/mr/mr0600.cpp
@@ -209,7 +209,8 @@ TString TCampass_app::esporta(const TString& DSN, const TString& usr, const TStr
 	TString o03; o03 << startExport("O03");
 
 	if(!o03a(o03)) errors << "ERRORE TABELLA: O03A\n";	// O03A
-	logFile << getTime() << " - Esportata tabella O03A\n";
+	else
+		logFile << getTime() << " - Esportata tabella O03A\n";
 	
 	endExport(o03);	
 	logFile << getTime() << " - Fine esportazione O03!\n";
@@ -221,8 +222,8 @@ TString TCampass_app::esporta(const TString& DSN, const TString& usr, const TStr
 	TString p02; p02 << startExport("P02");
 
 	if(!p02a(p02)) errors << "ERRORE TABELLA: P02A\n";	// P02A
-	
-	logFile << getTime() << " - Esportata tabella P02A\n";
+	else
+		logFile << getTime() << " - Esportata tabella P02A\n";
 
 	endExport(p02);	
 	
@@ -236,12 +237,12 @@ TString TCampass_app::esporta(const TString& DSN, const TString& usr, const TStr
 	TString p01; p01 << startExport("P01");
 
 	if(!p01a(p01)) errors << "ERRORE TABELLA: P01A\n"; // P01A
-	
-	logFile << getTime() << " - Esportata tabella P01A\n";
+	else
+		logFile << getTime() << " - Esportata tabella P01A\n";
 
 	if(!p01b(p01)) errors << "ERRORE TABELLA: P01B\n";	// P01B
-	
-	logFile << getTime() << " - Esportata tabella P01B\n";
+	else
+		logFile << getTime() << " - Esportata tabella P01B\n";
 
 	endExport(p01);
 	
@@ -254,18 +255,17 @@ TString TCampass_app::esporta(const TString& DSN, const TString& usr, const TStr
 	TString o01; o01 << startExport("O01");
 
 	if(!o01a(o01)) errors << "ERRORE TABELLA: O01A\n"; // O01A
-	
-	logFile << getTime() << " - Esportata tabella O01A\n";
+	else
+		logFile << getTime() << " - Esportata tabella O01A\n";
 
 	if(!o01e(o01)) errors << "ERRORE TABELLA: O01E\n"; // O01E
-	
-	logFile << getTime() << " - Esportata tabella O01E\n";
+	else
+		logFile << getTime() << " - Esportata tabella O01E\n";
 
 	endExport(o01);
 	
 	logFile << getTime() << " - Fine esportazione O01!\n";
 	
-
 	// INIZIO O02
 	
 	logFile << getTime() << " - Inizio esportazione O02:\n";
@@ -273,20 +273,20 @@ TString TCampass_app::esporta(const TString& DSN, const TString& usr, const TStr
 	TString o02; o02 << startExport("O02");
 	
 	if(!o02a("ORC", o02)) errors << "ERRORE TABELLA: O02A - ORC\n"; // O02A ORC
-	
-	logFile << getTime() << " - Esportata tabella O02A - ORC\n";
+	else
+		logFile << getTime() << " - Esportata tabella O02A - ORC\n";
 
 	if(!o02a("PRC", o02)) errors << "ERRORE TABELLA: O02A - PRC\n"; // O02A PRC
-	
-	logFile << getTime() << " - Esportata tabella O02A - PRC\n";
+	else
+		logFile << getTime() << " - Esportata tabella O02A - PRC\n";
 
 	if(!o02c("ORC", o02)) errors << "ERRORE TABELLA: O02C - ORC\n"; // O02C ORC
-	
-	logFile << getTime() << " - Esportata tabella O02C - ORC\n";
+	else
+		logFile << getTime() << " - Esportata tabella O02C - ORC\n";
 
 	if(!o02c("PRC", o02)) errors << "ERRORE TABELLA: O02C - PRC\n"; // O02C PRC
-	
-	logFile << getTime() << " - Esportata tabella O02C - PRC\n";
+	else
+		logFile << getTime() << " - Esportata tabella O02C - PRC\n";
 
 	endExport(o02);
 	
@@ -300,8 +300,8 @@ TString TCampass_app::esporta(const TString& DSN, const TString& usr, const TStr
 	TString a01; a01 << startExport("A01");
 
 	if(!a01a(a01)) errors << "ERRORE TABELLA: A01A\n"; // O01A
-	
-	logFile << getTime() << " - Esportata tabella A01A\n";
+	else
+		logFile << getTime() << " - Esportata tabella A01A\n";
 
 	endExport(a01);
 	
@@ -364,11 +364,14 @@ bool TCampass_app::a01a(const TString id) const
 				TRectype rowRDoc = curRdoc.curr();
 				// Dichiaro la stringa
 				TString sqlQuery;
-				sqlQuery << "INSERT INTO A01A ( IKRUNIMP, FAZI, CStr, CPRD, NMOV, CMAC, QPFPRO, FSALDO ) \
+				sqlQuery << "INSERT INTO A01A ( IKRUNIMP, FAZI, CStr, CPRD, NMOV, CMAC, QPFPRO, FSALDO, NFAS ) \
 									 VALUES('" << id << "','U','DBS','" << zeroFill(rowRDoc.get("NDOC")) << "." << rowRDoc.get("NRIGA") << "','1','" << rowRilprod.get("LINEA") << "','" << rowRilprod.get("QTA") << "','";
-				sqlQuery << (rowRilprod.get("CHIUSO") == "X" ? "1" : "0"); sqlQuery << "');";
+				sqlQuery << (rowRilprod.get("CHIUSO") == "X" ? "1" : "0"); sqlQuery << "','10');";
 				if(sqlset.exec(sqlQuery) != 1)
+				{
+					message_box(sqlQuery);
 					return false;
+				}
 			}
 		}
 	}
@@ -424,6 +427,7 @@ bool TCampass_app::o01a(const TString id) const
 				TCursor curFiltro(&rdoc, "RIGAEVASA != \"X\"", 1, &filtroFiltro, &filtroFiltro);
 				for (curFiltro = 0; curFiltro.pos() < curFiltro.items() && !p.is_cancelled(); ++curFiltro)
 				{
+					if(rowRDoc.get("RIGAEVASA") == "X") continue;	// Controllo ma la query sopra non mi va come al solito
 					// Dichiaro la stringa
 					TString sqlQuery;
 
@@ -433,9 +437,15 @@ bool TCampass_app::o01a(const TString id) const
 
 					// Inserisco TIPORD
 					sqlQuery << (rowRDoc.get("DACODNUM") == "ORC" ? "R" : "P");
+					
 					// Inserisco FLGSTA, CMAG, DPRICHI, DPRICHF, QPORD, XNOTE, CCLI
-					sqlQuery << "','" << rowRDoc.get("RIGAEVASA") << "','" << rowRDoc.get("CODMAG") << "','" << rowDoc.get("DATADOC") << "','" << rowRDoc.get("DATACONS")
-						<< "','" << zeroFill(rowRDoc.get("QTA")) << "',";
+					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");
+
+					sqlQuery << "','" << rowDoc.get_date("DATADOC").date2ansi() << "','" << rowRDoc.get_date("DATACONS").date2ansi() << "','" << zeroFill(rowRDoc.get("QTA")) << "',";
+					
 					// Controllo che il campo DESCEST sia pieno
 					TString desc; desc << rowRDoc.get("DESCEST");
 					if(desc.len() == 0)
@@ -445,7 +455,10 @@ bool TCampass_app::o01a(const TString id) const
 					sqlQuery << "'" << zeroFill(rowDoc.get("CODCF")) << "');";
 
 					if(sqlset.exec(sqlQuery) != 1)
-					return false;
+					{
+						message_box(sqlQuery);
+						return false;
+					}
 				}
 			}
 		}
@@ -499,7 +512,10 @@ bool TCampass_app::o01e(const TString id) const
 				sqlQuery << "INSERT INTO O01E ( IKRUNIMP, CPRD, CPARAM, CPARVAL ) \
 										VALUES('" << id << "','" << zeroFill(rowRDoc.get("NDOC")) << "." << rowRDoc.get("NRIGA") << "','CALUSC','" << codagg.sub(6) << "');";
 				if(sqlset.exec(sqlQuery) != 1)
+				{
+					message_box(sqlQuery);
 					return false;
+				}
 			}
 		}
 	}
@@ -550,11 +566,14 @@ bool TCampass_app::o02a(const TString CodNum, const TString id) const
 		// Inserisco FLGSTA
 		sqlQuery << (rowRDoc.get("RIGAEVASA") == "X" ? "C" : "A");
 		// Inserisco XRIFCLI, XNOTE, CART, QCORD, QCSPE, DCCONF
-		sqlQuery << "','" << rowDoc.get("NUMDOCRIF") << "-" << rowDoc.get("DATADOCRIF") << "','" << toEscape(rowRDoc.get("DESCEST")) << "','" << toEscape(rowRDoc.get("CODARTMAG")) 
-			<< "','" << rowRDoc.get("QTA") << "','" << rowRDoc.get("QTAEVASA") << "','" << rowRDoc.get("DATACONS") << "');";
+		sqlQuery << "','" << rowDoc.get("NUMDOCRIF") << "-" << rowDoc.get_date("DATADOCRIF").date2ansi() << "','" << toEscape(rowRDoc.get("DESCEST")) << "','" << toEscape(rowRDoc.get("CODARTMAG")) 
+			<< "','" << rowRDoc.get("QTA") << "','" << rowRDoc.get("QTAEVASA") << "','" << rowRDoc.get_date("DATACONS").date2ansi() << "');";
 
 		if(sqlset.exec(sqlQuery) != 1)
+		{
+			message_box(sqlQuery);
 			return false;
+		}
 	}
 	return sqlset.commit() == -1 ? false : true;
 }
@@ -603,7 +622,10 @@ bool TCampass_app::o02c(const TString CodNum, const TString id) const
 										VALUES('" << id << "','DBS','" << zeroFill(rowRDoc.get("NDOC")) << "." << rowRDoc.get("NRIGA") << "','" << zeroFill(rowRDoc.get("DANDOC")) << "','" << rowRDoc.get("DAIDRIGA") << "','1');";
 
 				if(sqlset.exec(sqlQuery) != 1)
+				{
+					message_box(sqlQuery);
 					return false;
+				}
 			}
 		}
 	}
@@ -639,7 +661,10 @@ bool TCampass_app::o03a(const TString id) const
 			VALUES('" << id << "','U','DBS','" << zeroFill(rowClifo.get("CODCF")) << "','" << toEscape(rowClifo.get("RAGSOC")) << "');";
 
 		if(sqlset.exec(sqlQuery) != 1)
+		{
+			message_box(sqlQuery);
 			return false;
+		}
 	}
 	return sqlset.commit() == -1 ? false : true;
 }
@@ -742,7 +767,10 @@ bool TCampass_app::p01a(const TString id) const
 		// Chiudo la query
 		sqlQuery << "');";
 		if(sqlset.exec(sqlQuery) != 1)
+		{
+			message_box(sqlQuery);
 			return false;
+		}
 	}
 	return sqlset.commit() == -1 ? false : true;
 }
@@ -843,7 +871,10 @@ bool TCampass_app::p02a(const TString id) const
 		sqlQuery << "INSERT INTO P02A (IKRUNIMP, FAZI, CStr, FGRP, NLIV0, RLIV0, CGRP0, RGRP0 ) \
 								VALUES('" << id << "','U','DBS','0','0','0','" << getGroup(rowTab.get("CODTAB")) << "','" << rowTab.get("S0") << "');";
 		if(sqlset.exec(sqlQuery) != 1)
+		{
+			message_box(sqlQuery);
 			return false;
+		}
 	}
 	return sqlset.commit() == -1 ? false : true;
 }
@@ -932,7 +963,10 @@ bool TCampass_app::o01b(const TString& DSN) const
 
 
 			if(sqlset.exec(sqlQuery) != 1)
+			{
+				message_box(sqlQuery);
 				return false;
+			}
 		}
 	}
 	return sqlset.commit() == -1 ? false : true;