diff --git a/cd/test/cg0500.txt b/cd/test/cg0500.txt
index d1ec8ee48..ba3037498 100644
--- a/cd/test/cg0500.txt
+++ b/cd/test/cg0500.txt
@@ -1,5 +1,9 @@
 cg1300n.msk
 cgmenu.men
 cg1.exe
+cg2.exe
 
-Programma di riallineamento tipo conto cliente/fornitore su causali e movimenti
\ No newline at end of file
+Programma di riallineamento tipo conto cliente/fornitore su causali e movimenti
+
+Se cambio da causale non IVA a causale IVA dà un errore cercando di settare
+il numero protocollo senza aver ancore cambiato la maschera (segnalato da CRPA)
\ No newline at end of file
diff --git a/cd/test/cg0500a.ini b/cd/test/cg0500a.ini
index e18d300c1..8aa8813b0 100644
--- a/cd/test/cg0500a.ini
+++ b/cd/test/cg0500a.ini
@@ -3,8 +3,8 @@ Demo=0
 
 [cg1]
 Edit_23 = cg2 -0
-File(263) = cg1300n.msk|X
-Patch = 496
+File(8) = cg2.exe|X
+Patch = 500
 Versione = 21511200
 
 [cg9]
@@ -13,84 +13,85 @@ Edit_20 = cg0 -1
 Edit_26 = cg0 -4
 Edit_5 = cg0 -5
 File(168) = cg1.exe|X
-File(207) = cgmenu.men|X
-Patch = 496
+File(179) = cg1300n.msk|X
+File(208) = cgmenu.men|X
+Patch = 500
 Versione = 21511200
 
 [cg99]
-Kill(0) = bastntb.rep|x
-Kill(1) = bastvet.msk|x
-Kill(2) = bastpdb.msk|x
-Kill(3) = bastmsp.msk|x
-Kill(4) = batbarb.msk|x
-Kill(5) = bastndo.rep|x
-Kill(6) = bastesc.msk|x
-Kill(7) = batbvet.msk|x
-Kill(8) = bastzon.msk|x
-Kill(9) = bastcve.rep|x
-Kill(10) = batbivd.msk|x
-Kill(11) = batbtit.msk|x
-Kill(12) = bastnot.msk|x
+Kill(0) = batbivd.msk|x
+Kill(1) = bastcfi.rep|x
+Kill(2) = bastivd.rep|x
+Kill(3) = batbtit.msk|x
+Kill(4) = bastscc.rep|x
+Kill(5) = bastleg.rep|x
+Kill(6) = batbndo.msk|x
+Kill(7) = batbver.msk|x
+Kill(8) = batbtra.msk|x
+Kill(9) = batblbu.msk|x
+Kill(10) = bastpor.rep|x
+Kill(11) = bastnot.msk|x
+Kill(12) = batblia.msk|x
 Kill(13) = bastcco.msk|x
-Kill(14) = batbcco.msk|x
-Kill(15) = bastscc.msk|x
+Kill(14) = batbntb.msk|x
+Kill(15) = bastver.msk|x
 Kill(16) = batbleg.msk|x
-Kill(17) = batblia.msk|x
-Kill(18) = bastpor.msk|x
-Kill(19) = batbcam.msk|x
+Kill(17) = batbdpn.msk|x
+Kill(18) = bastcco.rep|x
+Kill(19) = bastscc.msk|x
 Kill(20) = batbind.msk|x
-Kill(21) = bastcco.rep|x
-Kill(22) = batbntb.msk|x
-Kill(23) = bastpor.rep|x
-Kill(24) = bastcve.msk|x
-Kill(25) = batbesc.msk|x
-Kill(26) = bastleg.msk|x
-Kill(27) = bastmsp.rep|x
-Kill(28) = batbcfi.msk|x
-Kill(29) = bastarb.rep|x
-Kill(30) = batbins.msk|x
-Kill(31) = batblia.msk|x
-Kill(32) = batbscc.msk|x
-Kill(33) = bastivd.msk|x
-Kill(34) = batbinl.msk|x
-Kill(35) = bastreg.rep|x
+Kill(21) = batbcco.msk|x
+Kill(22) = bastcam.rep|x
+Kill(23) = batbarb.msk|x
+Kill(24) = batbpor.msk|x
+Kill(25) = bastndo.rep|x
+Kill(26) = bastpdb.msk|x
+Kill(27) = bastmsp.msk|x
+Kill(28) = bastreg.rep|x
+Kill(29) = bastesc.rep|x
+Kill(30) = bastzon.msk|x
+Kill(31) = bastarb.rep|x
+Kill(32) = batbpdb.msk|x
+Kill(33) = bastcve.rep|x
+Kill(34) = batbnot.msk|x
+Kill(35) = bastntb.rep|x
 Kill(36) = bastnot.rep|x
-Kill(37) = batbpdb.msk|x
-Kill(38) = cgtbcon.msk|x
-Kill(39) = bastver.rep|x
-Kill(40) = bastcfi.msk|x
-Kill(41) = bastntb.msk|x
-Kill(42) = batbnot.msk|x
-Kill(43) = bastesc.rep|x
-Kill(44) = batbzon.msk|x
-Kill(45) = bastarb.msk|x
+Kill(37) = bastvet.msk|x
+Kill(38) = bastarb.msk|x
+Kill(39) = bastvet.rep|x
+Kill(40) = batbcfi.msk|x
+Kill(41) = bastver.rep|x
+Kill(42) = bastpdb.rep|x
+Kill(43) = bastntb.msk|x
+Kill(44) = bastdpn.rep|x
+Kill(45) = bastcfi.msk|x
 Kill(46) = bastreg.msk|x
-Kill(47) = bastpdb.rep|x
-Kill(48) = bastivd.rep|x
-Kill(49) = bastndo.msk|x
-Kill(50) = batbdel.msk|x
-Kill(51) = batbmsp.msk|x
-Kill(52) = bastdpn.rep|x
-Kill(53) = bastvet.rep|x
-Kill(54) = batblbu.msk|x
-Kill(55) = bastcam.msk|x
+Kill(47) = batbinl.msk|x
+Kill(48) = bastcam.msk|x
+Kill(49) = batbcve.msk|x
+Kill(50) = cgtbcon.msk|x
+Kill(51) = bastndo.msk|x
+Kill(52) = batbreg.msk|x
+Kill(53) = batbmsp.msk|x
+Kill(54) = bastzon.rep|x
+Kill(55) = batbdel.msk|x
 Kill(56) = bastdpn.msk|x
-Kill(57) = batbreg.msk|x
-Kill(58) = bastscc.rep|x
-Kill(59) = batbdpn.msk|x
-Kill(60) = batbver.msk|x
-Kill(61) = bastleg.rep|x
-Kill(62) = bastzon.rep|x
-Kill(63) = batbcve.msk|x
-Kill(64) = bastcfi.rep|x
-Kill(65) = bastver.msk|x
-Kill(66) = batbndo.msk|x
-Kill(67) = batbtra.msk|x
-Kill(68) = bastcam.rep|x
-Kill(69) = batbpor.msk|x
+Kill(57) = batbzon.msk|x
+Kill(58) = bastesc.msk|x
+Kill(59) = batbvet.msk|x
+Kill(60) = batbscc.msk|x
+Kill(61) = bastleg.msk|x
+Kill(62) = batbesc.msk|x
+Kill(63) = batbcam.msk|x
+Kill(64) = batbins.msk|x
+Kill(65) = bastcve.msk|x
+Kill(66) = bastpor.msk|x
+Kill(67) = batblia.msk|x
+Kill(68) = bastivd.msk|x
+Kill(69) = bastmsp.rep|x
 
 [cg]
-Data = 15-01-2018
+Data = 17-01-2018
 Descrizione = Contabilita' Generale
 Dischi = 1
 Moduli = ba,pr9
diff --git a/cd/test/cg0500a1.zip b/cd/test/cg0500a1.zip
index c0c9011fd..3d5138ac3 100644
Binary files a/cd/test/cg0500a1.zip and b/cd/test/cg0500a1.zip differ