diff --git a/src/ps/ps0713800.cpp b/src/ps/ps0713800.cpp
index d458a8386..9e4337663 100644
--- a/src/ps/ps0713800.cpp
+++ b/src/ps/ps0713800.cpp
@@ -71,6 +71,7 @@ bool TEsportaIva_msk::on_field_event(TOperable_field& o, TField_event e, long jo
 		{
 			set(B_PRTAPE, "X");
 			set(B_PRTCHIU, "X");
+			set(B_SOLNONINV, "X");
 		}
 		break;
 	case DLG_RECALC:
@@ -149,7 +150,12 @@ TISAM_recordset TEsportaIva_msk::createRecset() const
 		query <<  "BETWEEN(23.DATADOC,#DADATAFATT,#ADATAFATT)&&";
 	}
 
-	query << "(23.INVIVA!=\"X\")&&(23.TIPO=\"F\")";
+	if(get_bool(B_SOLNONINV))
+	{
+		query << "(23.INVIVA!=\"X\")&&";
+	}
+	
+	query << "(23.TIPO=\"F\")";
 	
 	if(get_bool(B_FORNITORE))
 	{
@@ -283,7 +289,8 @@ void TEsportaIva_msk::fill()
 						const TRectype& rmovana = movana.body()[i];
 						const TString80 codcms = rmovana.get("CODCMS");        
 
-						row.add(codcms, 0);
+						row.add(rmoviva.get("23.DATAREG").as_string(), 0);
+						row.add(codcms);
 						row.add(rmoviva.get("23.CODCF").as_string());
 						row.add(rmoviva.get("20.RAGSOC").as_string());
 						char sez = rmovana.get_char("SEZIONE");
@@ -317,7 +324,8 @@ void TEsportaIva_msk::fill()
 					if (codcms.full())
 					{
 						TToken_string row;
-						row.add(codcms, 0);
+						row.add(rmoviva.get("23.DATAREG").as_string(), 0);
+						row.add(codcms);
 						row.add(rmoviva.get("23.CODCF").as_string());
 						row.add(rmoviva.get("20.RAGSOC").as_string());			
 						row.add(rmoviva.get(RMI_IMPONIBILE).as_real());
@@ -336,7 +344,8 @@ void TEsportaIva_msk::fill()
 				if (rmoviva.get("CODCMS").as_string().blank())
 				{
 					TToken_string row;
-					row.add("", 0);
+					row.add(rmoviva.get("23.DATAREG").as_string(), 0);
+					row.add("");
 					row.add(rmoviva.get("23.CODCF").as_string());
 					row.add(rmoviva.get("20.RAGSOC").as_string());			
 					row.add(rmoviva.get(RMI_IMPONIBILE).as_real());	
@@ -434,16 +443,16 @@ void TEsportaIva_app::esporta_righe_iva(const TEsportaIva_msk& m) const
 	if(!m.testFields())
 		return;
 
-	// Instanzio il TFilename e controllo la sua esistenza
-  TFilename path = m.get(F_PATH);
-	path.add(m.get(F_NAME));
-	if (path.exist())
-  {
-		TString str;
-    str << "ATTENZIONE! "  << "Il file " << m.get(F_NAME) << "è già esistente.\n"
-        << "Se si procede sara' azzerato il file esistente!\nContinuare?";
-    if (!yesno_box(str))
-			return;
+	// Instanzio il TFilename e controllo la sua esistenza
+  TFilename path = m.get(F_PATH);
+	path.add(m.get(F_NAME));
+	if (path.exist())
+  {
+		TString str;
+    str << "ATTENZIONE! "  << "Il file " << m.get(F_NAME) << "è già esistente.\n"
+        << "Se si procede sara' azzerato il file esistente!\nContinuare?";
+    if (!yesno_box(str))
+			return;
   }
 
 	bool with_cms = m.get_int(F_JOB) == 1;
@@ -487,14 +496,15 @@ void TEsportaIva_app::esporta_righe_iva(const TEsportaIva_msk& m) const
 						const TRectype& rmovana = movana.body()[i];
 						const TString80 codcms = rmovana.get("CODCMS");        
 
-						csv.set(0, codcms);
-						csv.set(1, rmoviva.get("23.CODCF"));
-						csv.set(2, rmoviva.get("20.RAGSOC"));
+						csv.set(0, rmoviva.get("23.DATAREG").as_string());
+						csv.set(1, codcms);
+						csv.set(2, rmoviva.get("23.CODCF"));
+						csv.set(3, rmoviva.get("20.RAGSOC"));
 						char sez = rmovana.get_char("SEZIONE");
 						TImporto importo(sez, rmovana.get_real("IMPORTO"));		
 						importo.normalize('D');
-						csv.set(3, importo.valore());
-						csv.set(4, rmoviva.get("23.RITFIS").as_real());
+						csv.set(4, importo.valore());
+						csv.set(5, rmoviva.get("23.RITFIS").as_real());
 						csv.set(6, rmoviva.get("23.DATADOC"));
 						csv.set(7, rmoviva.get("23.NUMDOC"));
 						csv.set(8, last_data_pag);
@@ -520,11 +530,12 @@ void TEsportaIva_app::esporta_righe_iva(const TEsportaIva_msk& m) const
 					if (codcms.full())
 					{
 						csv.new_rec("");
-						csv.set(0, codcms);
-						csv.set(1, rmoviva.get("23.CODCF"));
-						csv.set(2, rmoviva.get("20.RAGSOC"));			
-						csv.set(3, rmoviva.get(RMI_IMPONIBILE).as_real());		
-						csv.set(4, rmoviva.get("23.RITFIS").as_real());
+						csv.set(0, rmoviva.get("23.DATAREG").as_string());
+						csv.set(1, codcms);
+						csv.set(2, rmoviva.get("23.CODCF"));
+						csv.set(3, rmoviva.get("20.RAGSOC"));			
+						csv.set(4, rmoviva.get(RMI_IMPONIBILE).as_real());		
+						csv.set(5, rmoviva.get("23.RITFIS").as_real());
 						csv.set(6, rmoviva.get("23.DATADOC"));
 						csv.set(7, rmoviva.get("23.NUMDOC"));
 						csv.set(8, last_data_pag);
@@ -538,11 +549,12 @@ void TEsportaIva_app::esporta_righe_iva(const TEsportaIva_msk& m) const
 				if (rmoviva.get("CODCMS").as_string().blank())
 				{
 					csv.new_rec("");
-					csv.set(0, "");
-					csv.set(1, rmoviva.get("23.CODCF"));
-					csv.set(2, rmoviva.get("20.RAGSOC"));			
-					csv.set(3, rmoviva.get(RMI_IMPONIBILE).as_real());	
-					csv.set(4, rmoviva.get("23.RITFIS").as_real());
+					csv.set(0, rmoviva.get("23.DATAREG").as_string());
+					csv.set(1, "");
+					csv.set(2, rmoviva.get("23.CODCF"));
+					csv.set(3, rmoviva.get("20.RAGSOC"));			
+					csv.set(4, rmoviva.get(RMI_IMPONIBILE).as_real());	
+					csv.set(5, rmoviva.get("23.RITFIS").as_real());
 					csv.set(6, rmoviva.get("23.DATADOC"));
 					csv.set(7, rmoviva.get("23.NUMDOC"));
 					csv.set(8, last_data_pag);
diff --git a/src/ps/ps0713800a.h b/src/ps/ps0713800a.h
index dbd1c199c..650e5314e 100644
--- a/src/ps/ps0713800a.h
+++ b/src/ps/ps0713800a.h
@@ -1,15 +1,16 @@
 //campi maschera ps0713800a
-#define A_IDLAVORO			101
-#define A_CODF					102
-#define A_RAGSOC				103
-#define A_IMPORTO				104
-#define A_RITFIS				105
-#define A_DATADOC				106
-#define A_NUMDOC				107
-#define A_DATAPAG				108
-#define A_GRUPPO				109
-#define A_CONTO					110
-#define A_SOTTOCONTO		111
+#define A_DATAREG				101
+#define A_IDLAVORO			102
+#define A_CODF					103
+#define A_RAGSOC				104
+#define A_IMPORTO				105
+#define A_RITFIS				106
+#define A_DATADOC				107
+#define A_NUMDOC				108
+#define A_DATAPAG				109
+#define A_GRUPPO				110
+#define A_CONTO					111
+#define A_SOTTOCONTO		112
 
 #define F_PATH					201
 #define F_NAME					202
@@ -24,5 +25,6 @@
 #define B_PRTAPE				211
 #define B_PRTCHIU				212
 #define B_SOLRITFIS			213
+#define B_SOLNONINV			214
 
 #define S_RESULT				301
\ No newline at end of file
diff --git a/src/ps/ps0713800a.msk b/src/ps/ps0713800a.msk
index 895a4c5ce..e1d7530e7 100644
--- a/src/ps/ps0713800a.msk
+++ b/src/ps/ps0713800a.msk
@@ -122,6 +122,12 @@ BEGIN
   PROMPT 40 5 "Solo Ritenute Fiscali"
 END
 
+BOOLEAN B_SOLNONINV
+BEGIN
+  PROMPT 70 5 "Solo doc. non inviati"
+END
+
+
 RADIOBUTTON F_JOB 15
 BEGIN
   PROMPT 70 2 "ID lavoro"
@@ -133,6 +139,7 @@ END
 SPREADSHEET S_RESULT
 BEGIN
   PROMPT 0 6 ""
+  ITEM "Data\nRegistrazione@10"
   ITEM "ID Lavoro@10"
   ITEM "Cod.\nFornitore@8"
   ITEM "Rag. Soc.@30"
@@ -152,81 +159,76 @@ ENDMASK
 
 PAGE "Riga" -1 -1 69 10
 
+DATE A_DATAREG
+BEGIN
+  PROMPT 1 0 "Data registrazione"
+  FLAGS "D"
+END
+
 NUMBER A_IDLAVORO 7
 BEGIN
   PROMPT 1 0 "N.Movimento"
   FLAGS "D"
-  FIELD PROGR
 END
 
 STRING A_CODF 6
 BEGIN
   PROMPT 1 0 "Codice Fornitore"
   FLAGS "D"
-  FIELD PROGR
 END
 
 STRING A_RAGSOC 50
 BEGIN
   PROMPT 1 0 "Rag.Soc."
   FLAGS "D"
-  FIELD PROGR
 END
 
 NUMBER A_IMPORTO 18 3
 BEGIN
   PROMPT 1 0 "Importo"
   FLAGS "D"
-  FIELD PROGR
 END
 
 NUMBER A_RITFIS 18 3
 BEGIN
   PROMPT 1 0 "Ritenute Fiscali"
   FLAGS "D"
-  FIELD PROGR
 END
 
 DATE A_DATADOC
 BEGIN
   PROMPT 1 0 "Data Documento"
   FLAGS "D"
-  FIELD PROGR
 END
 
 STING A_NUMDOC 7
 BEGIN
   PROMPT 1 0 "Numero Documento"
   FLAGS "D"
-  FIELD PROGR
 END
 
 DATE A_DATAPAG
 BEGIN
   PROMPT 1 0 "Data pagamento documento"
   FLAGS "D"
-  FIELD PROGR
 END
 
 NUMBER A_GRUPPO 3
 BEGIN
   PROMPT 1 0 "Gruppo"
   FLAGS "D"
-  FIELD PROGR
 END
 
 NUMBER A_CONTO 3
 BEGIN
   PROMPT 1 0 "Conto"
   FLAGS "D"
-  FIELD PROGR
 END
 
 NUMBER A_SOTTOCONTO 6
 BEGIN
   PROMPT 1 0 "Sottoconto"
   FLAGS "D"
-  FIELD PROGR
 END
 
 ENDPAGE