diff --git a/cd/test/fp0762.txt b/cd/test/fp0762.txt
new file mode 100644
index 000000000..71584dc7d
--- /dev/null
+++ b/cd/test/fp0762.txt
@@ -0,0 +1,3 @@
+fp0.exe
+
+- Corretta abilitazione bottoni
\ No newline at end of file
diff --git a/cd/test/fp0762a.ini b/cd/test/fp0762a.ini
new file mode 100644
index 000000000..4073144d2
--- /dev/null
+++ b/cd/test/fp0762a.ini
@@ -0,0 +1,19 @@
+[Main]
+Demo=0
+
+[fp1]
+File(0) = fp0.exe|X
+Patch = 762
+Versione = 21511200
+
+[fp]
+Data = 08-04-2019
+Descrizione = Fattura Elettronica
+Dischi = 1
+Moduli = cg,ve
+OEM = 
+Patch = 762
+PostProcess = 
+PreProcess = 
+Versione = 21511200
+
diff --git a/cd/test/fp0762a1.zip b/cd/test/fp0762a1.zip
new file mode 100644
index 000000000..b76281348
Binary files /dev/null and b/cd/test/fp0762a1.zip differ
diff --git a/cd/test/tf0760.txt b/cd/test/tf0760.txt
new file mode 100644
index 000000000..b513c7a02
--- /dev/null
+++ b/cd/test/tf0760.txt
@@ -0,0 +1,3 @@
+tf0.exe
+
+Tolto San Marino tra i soggetti a fatturazione elettronica
diff --git a/cd/test/tf0760a.ini b/cd/test/tf0760a.ini
new file mode 100644
index 000000000..9e5701a34
--- /dev/null
+++ b/cd/test/tf0760a.ini
@@ -0,0 +1,19 @@
+[Main]
+Demo=0
+
+[tf1]
+File(0) = tf0.exe|X
+Patch = 0760
+Versione = 21511200
+
+[tf]
+Data = 08-04-2019
+Descrizione = Trasferimento fatture
+Dischi = 1
+Moduli = cg
+OEM = 
+Patch = 760
+PostProcess = 
+PreProcess = 
+Versione = 21511200
+
diff --git a/cd/test/tf0760a1.zip b/cd/test/tf0760a1.zip
new file mode 100644
index 000000000..fe7df4169
Binary files /dev/null and b/cd/test/tf0760a1.zip differ
diff --git a/cd/test/tf0764.txt b/cd/test/tf0764.txt
new file mode 100644
index 000000000..6d86f52ed
--- /dev/null
+++ b/cd/test/tf0764.txt
@@ -0,0 +1,3 @@
+tf0.exe
+
+- Reso non bloccante controllo iniziale "Aggiornamento tipo conto cliente/fornitore"
\ No newline at end of file
diff --git a/cd/test/tf0764a.ini b/cd/test/tf0764a.ini
new file mode 100644
index 000000000..6e8bb3155
--- /dev/null
+++ b/cd/test/tf0764a.ini
@@ -0,0 +1,19 @@
+[Main]
+Demo=0
+
+[tf1]
+File(0) = tf0.exe|X
+Patch = 764
+Versione = 21511200
+
+[tf]
+Data = 08-04-2019
+Descrizione = Trasferimento fatture
+Dischi = 1
+Moduli = cg
+OEM = 
+Patch = 764
+PostProcess = 
+PreProcess = 
+Versione = 21511200
+
diff --git a/cd/test/tf0764a1.zip b/cd/test/tf0764a1.zip
new file mode 100644
index 000000000..7a5e189d9
Binary files /dev/null and b/cd/test/tf0764a1.zip differ
diff --git a/src/cg/cg1300.cpp b/src/cg/cg1300.cpp
index e73561432..47880015a 100755
--- a/src/cg/cg1300.cpp
+++ b/src/cg/cg1300.cpp
@@ -134,10 +134,11 @@ int cg1300(int argc, char* argv[])
       TAgg_tconto a;                      
       a.run(argc, argv, TR("Aggiornamento tipo conto"));    // cg1302
     }
-	  case 'U':
-    {
-      TAgg_tcontoCF a;                      
-      a.run(argc, argv, TR("Aggiornamento tipo conto cliente/fornitore"));    // cg1314
+		break;
+  case 'U':
+	  {
+	    TAgg_tcontoCF a;                      
+	    a.run(argc, argv, TR("Aggiornamento tipo conto cliente/fornitore"));    // cg1314
 		}
     break;
   case 'M':
diff --git a/src/fp/fp0300.cpp b/src/fp/fp0300.cpp
index e377e2ad4..0980d1b3b 100644
--- a/src/fp/fp0300.cpp
+++ b/src/fp/fp0300.cpp
@@ -158,9 +158,9 @@ void TPA_mask::fill()
 	enable(DLG_FINDREC);
 	enable(DLG_PRINT);
 #else
-	enable(DLG_OK, filter_selected != "X" && filter_selected != "P");
-	enable(DLG_SAVEREC, (fp_settings().is_f8() && filter_selected == "X") || filter_selected == "P");
-	enable(DLG_FINDREC, filter_selected == "P");
+	enable(DLG_OK, filter_selected.empty() || filter_selected == "E");
+	enable(DLG_SAVEREC, (fp_settings().is_f8() && filter_selected == "X") || filter_selected == "D");
+	enable(DLG_FINDREC, filter_selected == "D");
 	enable(DLG_PRINT, _enable_chiave_fixer && filter_selected == "X");
 #endif
 
diff --git a/src/fp/fp0400.cpp b/src/fp/fp0400.cpp
index de7e3cd77..d0c2bffb8 100644
--- a/src/fp/fp0400.cpp
+++ b/src/fp/fp0400.cpp
@@ -124,7 +124,7 @@ void TPassive_mask::fill()
 		"WHERE P7_DATA >= \'" << dal.date2ansi() << "\' AND P7_DATA <= \'" << al.date2ansi() << "\'" << prots_query << "\n" <<
 		"GROUP BY YEAR(P7_DATA), P7_TIPODOC, P7_NUMERO, P7_DATA, PZ_DATAORARIC, PQ_IMPTOTDOC, PZ_NUMREGCONT, PZ_DATAREGCONT, P2_ANADENOMIN, P2_ANANOME, P2_ANACOGNOME, P2_FISCIVACOD, P2_CODFISCALE, P2_FISCIVAPAESE,\n" <<
 		"P1_CODDEST, PU_PEC, P1_KEYPRGINVIO, P1_KEYHEADERFATT, P1_KEYBODYFATT, PZ_TIPOPROT, PZ_NUMPROT, PZ_ANNOPROT, PZ_TIPOCF, PZ_CLIFOR\n" <<
-		"ORDER BY " << (ordin == "R"? "PZ_DATAORARIC" : "P7_DATA") << " " << (verso_ord == "C"? "ASC" : "DESC");
+		"ORDER BY " << (ordin == "D"? "P7_DATA" : "PZ_DATAORARIC") << " " << (verso_ord == "C"? "ASC" : "DESC");
 	fp_db().sq_set_exec(query, false);
 
 	_list_fatt_err.clear();
diff --git a/src/fp/fp0400a.uml b/src/fp/fp0400a.uml
index fc58df969..b5bfc0412 100644
--- a/src/fp/fp0400a.uml
+++ b/src/fp/fp0400a.uml
@@ -60,8 +60,8 @@ END
 RADIOBUTTON F_FATTORD 20 20
 BEGIN
   PROMPT 1 5 "Ordinamento fatture per "
-  ITEM "|Data Documento"
-  ITEM "R|Data Ricezione"
+  ITEM "|Data Ricezione"
+  ITEM "D|Data Documento"
   FLAGS ""
 END
 
diff --git a/src/tf/tf0101.cpp b/src/tf/tf0101.cpp
index 6a3f9a91b..3fee34f4f 100644
--- a/src/tf/tf0101.cpp
+++ b/src/tf/tf0101.cpp
@@ -826,9 +826,10 @@ TTrFa_mask::TTrFa_mask(const TString& msk)
 			if (ini_get_int(CONFIG_DITTA, "cg", "atccf", 0) <= 0)
 				fatal_box("L'aggiornamento non è andato a buon fine, non puoi procedere con il Trasferimento Fatture");
 		}
-		else
-			fatal_box("Senza effettuare l'aggiornamento non possiamo garantirti il corretto funzionamento del Trasferimento Fatture.\nIl programma sarà terminato.");
-		
+		else if(yesno_box("Senza effettuare l'aggiornamento non possiamo garantirti il corretto funzionamento del Trasferimento Fatture.\nSi e' sicuri di proseguire?") == 0)
+		{
+			fatal_box("Programma terminato");
+		}		
 	}
 
 #endif // !DBG