diff --git a/cd/test/ri0562.txt b/cd/test/ri0562.txt
new file mode 100644
index 000000000..184b615cd
--- /dev/null
+++ b/cd/test/ri0562.txt
@@ -0,0 +1,14 @@
+ritbper.msk
+ritbrco.msk
+ri0.exe
+ri0200a.msk
+ri1.exe
+rimenu.men
+ri0200xa.msk
+ri0400a.msk
+ritbric.msk
+ristper.msk
+ristper.rep
+
+
+Ricompilato modulo
\ No newline at end of file
diff --git a/cd/test/ri0562a.ini b/cd/test/ri0562a.ini
new file mode 100644
index 000000000..6f0ddf545
--- /dev/null
+++ b/cd/test/ri0562a.ini
@@ -0,0 +1,29 @@
+[Main]
+Demo=0
+
+[ri1]
+File(0) = ri0.exe|X
+File(1) = ri0200a.msk|X
+File(2) = ri0200xa.msk|X
+File(3) = ri0400a.msk|X
+File(4) = ri1.exe|X
+File(5) = rimenu.men|X
+File(6) = ristper.msk|X
+File(7) = ristper.rep|X
+File(8) = ritbper.msk|X
+File(9) = ritbrco.msk|X
+File(10) = ritbric.msk|X
+Patch = 562
+Versione = 21511200
+
+[ri]
+Data = 17-04-2018
+Descrizione = Riclassificazione
+Dischi = 1
+Moduli = cg
+OEM = 
+Patch = 562
+PostProcess = 
+PreProcess = 
+Versione = 21511200
+
diff --git a/cd/test/ri0562a1.zip b/cd/test/ri0562a1.zip
new file mode 100644
index 000000000..388f921cf
Binary files /dev/null and b/cd/test/ri0562a1.zip differ
diff --git a/cd/test/ri0564.txt b/cd/test/ri0564.txt
new file mode 100644
index 000000000..b344d446a
--- /dev/null
+++ b/cd/test/ri0564.txt
@@ -0,0 +1 @@
+rimenu.men
diff --git a/cd/test/ri0564a.ini b/cd/test/ri0564a.ini
new file mode 100644
index 000000000..9808e708f
--- /dev/null
+++ b/cd/test/ri0564a.ini
@@ -0,0 +1,19 @@
+[Main]
+Demo=0
+
+[ri1]
+File(5) = rimenu.men|X
+Patch = 0564
+Versione = 21511200
+
+[ri]
+Data = 19-04-2018
+Descrizione = Riclassificazione
+Dischi = 1
+Moduli = cg
+OEM = 
+Patch = 564
+PostProcess = 
+PreProcess = 
+Versione = 21511200
+
diff --git a/cd/test/ri0564a1.zip b/cd/test/ri0564a1.zip
new file mode 100644
index 000000000..f16318b7a
Binary files /dev/null and b/cd/test/ri0564a1.zip differ
diff --git a/cd/test/tf0566.txt b/cd/test/tf0566.txt
new file mode 100644
index 000000000..6c40c252b
--- /dev/null
+++ b/cd/test/tf0566.txt
@@ -0,0 +1,4 @@
+modulisirio\modulisirio.jar
+tf0.exe
+
+Impostato codice trasmissione dinamico, aggiornamento ModuliSirio
\ No newline at end of file
diff --git a/cd/test/tf0566a.ini b/cd/test/tf0566a.ini
new file mode 100644
index 000000000..89dee6119
--- /dev/null
+++ b/cd/test/tf0566a.ini
@@ -0,0 +1,20 @@
+[Main]
+Demo=0
+
+[tf1]
+File(4) = modulisirio\modulisirio.jar|X
+File(5) = tf0.exe|X
+Patch = 0566
+Versione = 21511200
+
+[tf]
+Data = 19-04-2018
+Descrizione = Trasferimento fatture
+Dischi = 1
+Moduli = cg
+OEM = 
+Patch = 566
+PostProcess = 
+PreProcess = 
+Versione = 21511200
+
diff --git a/cd/test/tf0566a1.zip b/cd/test/tf0566a1.zip
new file mode 100644
index 000000000..d52069421
Binary files /dev/null and b/cd/test/tf0566a1.zip differ
diff --git a/exe/ModuliSirio/ModuliSirio.jar b/exe/ModuliSirio/ModuliSirio.jar
index 7bd589732..463e93cc0 100644
Binary files a/exe/ModuliSirio/ModuliSirio.jar and b/exe/ModuliSirio/ModuliSirio.jar differ
diff --git a/src/ri/rimenu.men b/src/ri/rimenu.men
index 4dbdabb12..3b34d2c8c 100755
--- a/src/ri/rimenu.men
+++ b/src/ri/rimenu.men
@@ -1,10 +1,10 @@
-[RIMENU_001]
-Caption = "Riclassificazione"
-Picture = <ci01>
-Module  = 8
-Flags   = "F"
-Item_01 = "Tabella Riclassificazioni", "ri0 -0 &ric", ""
-Item_02 = "Conti RIclassificati", "ri0 -0 &rco", ""
-Item_03 = "Tabella Periodi Riclassificazione", "ri0 -0 &per", ""
-Item_04 = "Riclassificazione Conti", "ri0 -1", ""
-Item_05 = "Riclassificazione Saldi", "ri0 -3", "F"
+[RIMENU_001]
+Caption = "Riclassificazione"
+Picture = <ci01>
+Module  = RI
+Flags   = "F"
+Item_01 = "Tabella Riclassificazioni", "ri0 -0 &ric", ""
+Item_02 = "Conti RIclassificati", "ri0 -0 &rco", ""
+Item_03 = "Tabella Periodi Riclassificazione", "ri0 -0 &per", ""
+Item_04 = "Riclassificazione Conti", "ri0 -1", ""
+Item_05 = "Riclassificazione Saldi", "ri0 -3", "F"
diff --git a/src/tf/tf0500.cpp b/src/tf/tf0500.cpp
index 8a5070807..638cfc0f1 100644
--- a/src/tf/tf0500.cpp
+++ b/src/tf/tf0500.cpp
@@ -12,7 +12,7 @@
 #define TIPO_FILE "DF"
 #define TFBASE "ModuliSirio"
 
-#define CODICE_FORNITURA "IVP17"
+#define CODICE_FORNITURA "IVP"
 
 class TIvaSend_msk : public TAutomask
 {
@@ -268,7 +268,8 @@ bool TIvaSend_app::generate(TIvaSend_msk& msk)
 TToken_string TIvaSend_app::getTestata(TIvaSend_msk& msk)
 {
 	TToken_string testata;							// Token string di virgole
-	testata.add(CODICE_FORNITURA);			// Codice Fornitura
+	TString cod_forn = CODICE_FORNITURA; cod_forn << msk.get(F_ANNO).right(2);
+	testata.add(cod_forn);							// Codice Fornitura
 	testata.add("");										// Cod.Fisc. Sost. Dich.
 	testata.add("");										// Cod. Carica Sost. Dich.
 	testata.add(msk.get_int(F_ANNO));		// Anno comunicazione