diff --git a/src/mr/mr0600.cpp b/src/mr/mr0600.cpp
index 7358f7fb0..15e8af84a 100644
--- a/src/mr/mr0600.cpp
+++ b/src/mr/mr0600.cpp
@@ -424,45 +424,41 @@ bool TCampass_app::o01a(const TString id) const
 			filtroFiltro.put("NDOC", rowRDoc.get("DANDOC"));
 			filtroFiltro.put("IDRIGA", rowRDoc.get("DAIDRIGA"));
 			TCursor curFiltro(&rdoc, "", 1, &filtroFiltro, &filtroFiltro);
+			if (curFiltro.items() == 0 || rowRDoc.get_bool("RIGAEVASA")) continue; // Controllo ma la query sopra non mi va come al solito
+			// Dichiaro la stringa
+			TString sqlQuery;
 
-			for (curFiltro = 0; curFiltro.pos() < curFiltro.items() && !p.is_cancelled(); ++curFiltro)
+			// Inserisco IIKRUNIMP, FAZI, CStr, CPRD, CART
+			sqlQuery << "INSERT INTO O01A ( IKRUNIMP, FAZI, CStr, CPRD, CART, TIPORD, FLGSTA, CMAG, DPRICHI, DPRICHF, QPORD, XNOTE, CCLI ) \
+									VALUES('" << id << "','U','DBS','" << zeroFill(rowDoc.get("NDOC")) << "." << rowRDoc.get("IDRIGA") << "','" << rowRDoc.get("CODARTMAG") << "','";
+
+			// Inserisco TIPORD
+			sqlQuery << (rowRDoc.get("DACODNUM") == "ORC" ? "R" : "P");
+					
+			// Inserisco FLGSTA, CMAG, DPRICHI, DPRICHF, QPORD, XNOTE, CCLI
+			sqlQuery << "',NULL,'";
+					
+			// Se non ho un codice magazzino metto lo standard, Roberto ha detto di metterlo a mano tanto non cambierà mai!
+			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")) << "',";
+					
+			// Controllo che il campo DESCEST sia pieno
+			TString desc; desc << rowRDoc.get("DESCEST");
+			if(desc.len() == 0)
+				sqlQuery << "NULL,";
+			else
+				sqlQuery << "'" << desc << "',";
+			sqlQuery << "'" << zeroFill(rowDoc.get("CODCF")) << "');";
+
+			if(sqlset.exec(sqlQuery) != 1)
 			{
-				if(rowRDoc.get_bool("RIGAEVASA")) continue;	// Controllo ma la query sopra non mi va come al solito
-				// Dichiaro la stringa
-				TString sqlQuery;
-
-				// Inserisco IIKRUNIMP, FAZI, CStr, CPRD, CART
-				sqlQuery << "INSERT INTO O01A ( IKRUNIMP, FAZI, CStr, CPRD, CART, TIPORD, FLGSTA, CMAG, DPRICHI, DPRICHF, QPORD, XNOTE, CCLI ) \
-										VALUES('" << id << "','U','DBS','" << zeroFill(rowDoc.get("NDOC")) << "." << rowRDoc.get("IDRIGA") << "','" << rowRDoc.get("CODARTMAG") << "','";
-
-				// Inserisco TIPORD
-				sqlQuery << (rowRDoc.get("DACODNUM") == "ORC" ? "R" : "P");
-					
-				// Inserisco FLGSTA, CMAG, DPRICHI, DPRICHF, QPORD, XNOTE, CCLI
-				sqlQuery << "',NULL,'";
-					
-				// Se non ho un codice magazzino metto lo standard, Roberto ha detto di metterlo a mano tanto non cambierà mai!
-				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")) << "',";
-					
-				// Controllo che il campo DESCEST sia pieno
-				TString desc; desc << rowRDoc.get("DESCEST");
-				if(desc.len() == 0)
-					sqlQuery << "NULL,";
-				else
-					sqlQuery << "'" << desc << "',";
-				sqlQuery << "'" << zeroFill(rowDoc.get("CODCF")) << "');";
-
-				if(sqlset.exec(sqlQuery) != 1)
-				{
-					message_box(sqlQuery);
-					return false;
-				}
+				message_box(sqlQuery);
+				return false;
 			}
 		}
 	}
@@ -627,7 +623,7 @@ bool TCampass_app::o02c(const TString CodNum, const TString id) const
 			TString sqlQuery;
  			// Inserisco Tutto (yeeeeeeeeeeeeeee)
 			sqlQuery << "INSERT INTO O02C ( IKRUNIMP, CStr, CPRD, CCLIH, CCLIR, BVAL, DBS_CART) \
-									VALUES('" << id << "','DBS','" << zeroFill(rowRDoc.get("NDOC")) << "." << rowRDoc.get("IDRIGA") << "','" << rowRDoc.get("DAANNO") << "." << CodNum << "." << zeroFill(rowRDoc.get("DANDOC")) << "','" << rowRDoc.get("DAIDRIGA") << "','1','" << rowRDoc.get("CODART") << "');";
+									VALUES('" << id << "','DBS','" << zeroFill(rowRDoc.get("NDOC")) << "." << rowRDoc.get("NRIGA") << "','" << rowRDoc.get("DAANNO") << "." << CodNum << "." << zeroFill(rowRDoc.get("DANDOC")) << "','" << rowRDoc.get("DAIDRIGA") << "','1','" << rowRDoc.get("CODART") << "');";
 
 			if(sqlset.exec(sqlQuery) != 1)
 			{