diff --git a/src/fp/fp0700.cpp b/src/fp/fp0700.cpp
index 46b713945..dcd948228 100644
--- a/src/fp/fp0700.cpp
+++ b/src/fp/fp0700.cpp
@@ -155,17 +155,6 @@ void TPAR_mask::fill()
 
 	regs.enable_column(S_SELECTED, filter_selected!="X" ||is_f8());
 
-
-	//TAnagrafica ditta = 
-
-		/*
-			VECCHIA QUERY
-
-			query << "USE " << LF_MOV << " KEY 3 SELECT (BETWEEN(" << MOV_DATAREG << ","
-		    << dal.date2ansi() << ',' << al.date2ansi() << "))&&(REG!=\"\")"
-				<< "\nFROM " << MOV_TIPO << "=C\nTO " << MOV_TIPO "=C";
-		*/
-
 		//MY QUERY
 
 	//DA RIVEDERE QUESTA QUERY 
diff --git a/src/fp/fplib01.cpp b/src/fp/fplib01.cpp
index d96f69e1c..8360ae9e8 100644
--- a/src/fp/fplib01.cpp
+++ b/src/fp/fplib01.cpp
@@ -2159,13 +2159,27 @@ bool TDoc_fp::doc_to_paf(TDocumentoEsteso& doc)
 
 		if (posret > 0)
 			rifs.cut(posret);
-		if (rifs.len() > 25 && rifs[25] == ' ')
+		rifs.replace(" - ", "|");
+
+		TToken_string patched_rifs;
+		TToken_string rifs_token = rifs;
+
+		FOR_EACH_STR_TOKEN(rifs_token, rif)
 		{
-			temp = rifs;
-			rifs = temp.left(25);
-			temp.ltrim(26);
-			rifs << temp;
+			TToken_string boll_rif(rif, ' ');
+			
+			if(boll_rif.items()>2)
+			{
+				TToken_string work(boll_rif.get(0), ' ');
+				TString data = boll_rif.get(1);
+		
+				data << boll_rif.get(2);
+				work.add(data);
+				boll_rif = work;
+			}
+			patched_rifs.add(boll_rif);
 		}
+		rifs = patched_rifs;
 		rifs.trim();
 		if (rifs == "0")
 			rifs.cut(0);
@@ -2174,8 +2188,6 @@ bool TDoc_fp::doc_to_paf(TDocumentoEsteso& doc)
 
 		if (len > 0)
 		{
-			rifs.replace(" - ", "|");
-
 			long numlinea = 0;
 			TToken_string elab_rifs(rifs);