diff --git a/src/mr/mr0600.cpp b/src/mr/mr0600.cpp
index 641f8710e..d5a9034fd 100644
--- a/src/mr/mr0600.cpp
+++ b/src/mr/mr0600.cpp
@@ -248,24 +248,6 @@ TString TCampass_app::esporta(const TString& DSN, const TString& usr, const TStr
 	
 	logFile << getTime() << " - Fine esportazione P01!\n";
 	
-	// INIZIO O01
-	
-	logFile << getTime() << " - Inizio esportazione O01:\n";
-
-	TString o01; o01 << startExport("O01");
-
-	if(!o01a(o01)) errors << "ERRORE TABELLA: O01A\n"; // O01A
-	else
-		logFile << getTime() << " - Esportata tabella O01A\n";
-
-	if(!o01e(o01)) errors << "ERRORE TABELLA: O01E\n"; // O01E
-	else
-		logFile << getTime() << " - Esportata tabella O01E\n";
-
-	endExport(o01);
-	
-	logFile << getTime() << " - Fine esportazione O01!\n";
-	
 	// INIZIO O02
 	
 	logFile << getTime() << " - Inizio esportazione O02:\n";
@@ -293,6 +275,25 @@ TString TCampass_app::esporta(const TString& DSN, const TString& usr, const TStr
 	logFile << getTime() << " - Fine esportazione O02!\n";
 	
 	
+	// INIZIO O01
+	
+	logFile << getTime() << " - Inizio esportazione O01:\n";
+
+	TString o01; o01 << startExport("O01");
+
+	if(!o01a(o01)) errors << "ERRORE TABELLA: O01A\n"; // O01A
+	else
+		logFile << getTime() << " - Esportata tabella O01A\n";
+
+	if(!o01e(o01)) errors << "ERRORE TABELLA: O01E\n"; // O01E
+	else
+		logFile << getTime() << " - Esportata tabella O01E\n";
+
+	endExport(o01);
+	
+	logFile << getTime() << " - Fine esportazione O01!\n";
+	
+	
 	// INIZIO A01
 	
 	logFile << getTime() << " - Inizio esportazione A01:\n";
@@ -417,7 +418,7 @@ bool TCampass_app::o01a(const TString id) const
 
 			// Vado a prendere la riga di riferimento
 			TRectype filtroFiltro(rdoc.curr());
-			if(rowRDoc.get("DACODNUM") == "ORC")
+			if(rowRDoc.get("DACODNUM") == "ORC" || rowRDoc.get("DACODNUM") == "PRC")
 			{
 				filtroFiltro.put("CODNUM", rowRDoc.get("DACODNUM"));
 				filtroFiltro.put("ANNO", rowRDoc.get("DAANNO"));
@@ -565,13 +566,17 @@ bool TCampass_app::o02a(const TString CodNum, const TString id) const
 		TRectype rowDoc = (curDoc.curr());
 
 		// Inserisco IKRUNIMP, FAZI, CStr, CMAG, CCLIH, CCLIR, CCLI
-		sqlQuery << "INSERT INTO O02A ( IKRUNIMP, FAZI, CStr, CMAG, CCLIH, CCLIR, CCLI, FLGSTA, XRIFCLI, XNOTE, CART, QCORD, QCSPE, DCCONF ) \
-								VALUES('" << id << "','U','DBS','" << rowRDoc.get("CODMAG") << "','" << rowRDoc.get("ANNO") << "." << CodNum << "." << zeroFill(rowRDoc.get("NDOC")) << "','" << rowRDoc.get("NRIGA") << "','" << zeroFill(rowDoc.get("CODCF")) << "','";
+		sqlQuery << "INSERT INTO O02A ( IKRUNIMP, FAZI, CStr, CMAG, CCLIH, CCLIR, CCLI, FLGSTA, XRIFCLI, XNOTE, CART, QCORD, QCSPE, DCCONF, DBS_CCLIHOLD, DBS_CCLIROLD ) \
+								VALUES('" << id << "','U','DBS','" << rowRDoc.get("CODMAG") << "','" << rowRDoc.get("ANNO") << "." << CodNum << "." << zeroFill(rowRDoc.get("NDOC")) << "','" << rowRDoc.get("IDRIGA") << "','" << zeroFill(rowDoc.get("CODCF")) << "','";
 		// Inserisco FLGSTA
 		sqlQuery << (rowRDoc.get("RIGAEVASA") == "X" ? "C" : "A");
 		// Inserisco XRIFCLI, XNOTE, CART, QCORD, QCSPE, DCCONF
 		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() << "');";
+			<< "','" << rowRDoc.get("QTA") << "','" << rowRDoc.get("QTAEVASA") << "','" << rowRDoc.get_date("DATACONS").date2ansi() << "','";
+		if(rowRDoc.get("DANDOC") != "")
+			sqlQuery <<  rowRDoc.get("DAANNO") << "." << CodNum << "." << zeroFill(rowRDoc.get("DANDOC")) << "','" << rowRDoc.get("DAIDRIGA") << "');";
+		else
+			sqlQuery << "','');";
 
 		if(sqlset.exec(sqlQuery) != 1)
 		{