Merge remote-tracking branch 'origin/R_10_00' into R_10_00

cd/test/cg0846.txt

@@ -3,3 +3,5 @@ cg2fppro.msk
 
 Cambiata icona ricarica fatture su 'Fatture SDI'
 Aggiunta importazione percent. e natura iva da ini con f1
+Corretta importazione importo totale con ritenute
+Corretto calcolo ritenute in maschera fppro

cd/test/cg0846a.ini

@@ -9,79 +9,79 @@ Patch = 846
 Versione = 21511200
 
 [cg99]
-Kill(0) = batbmsp.msk|x
-Kill(1) = bastcve.rep|x
-Kill(2) = batbins.msk|x
-Kill(3) = bastscc.rep|x
-Kill(4) = batbcam.msk|x
-Kill(5) = batbpdb.msk|x
-Kill(6) = bastver.msk|x
-Kill(7) = batbcco.msk|x
-Kill(8) = batbesc.msk|x
-Kill(9) = batbdpn.msk|x
-Kill(10) = bastndo.msk|x
-Kill(11) = bastesc.msk|x
-Kill(12) = batbndo.msk|x
+Kill(0) = bastndo.msk|x
+Kill(1) = batblbu.msk|x
+Kill(2) = bastzon.msk|x
+Kill(3) = bastesc.msk|x
+Kill(4) = bastscc.msk|x
+Kill(5) = bastvet.msk|x
+Kill(6) = bastcve.msk|x
+Kill(7) = batbntb.msk|x
+Kill(8) = bastndo.rep|x
+Kill(9) = batbvet.msk|x
+Kill(10) = batbcve.msk|x
+Kill(11) = batbndo.msk|x
+Kill(12) = bastpor.msk|x
 Kill(13) = batbind.msk|x
-Kill(14) = bastmsp.msk|x
-Kill(15) = bastreg.rep|x
+Kill(14) = batbtit.msk|x
+Kill(15) = bastntb.rep|x
 Kill(16) = batbleg.msk|x
-Kill(17) = bastpor.msk|x
-Kill(18) = batbpor.msk|x
-Kill(19) = batbcfi.msk|x
+Kill(17) = bastcco.rep|x
+Kill(18) = bastmsp.rep|x
+Kill(19) = bastreg.rep|x
 Kill(20) = bastcco.msk|x
-Kill(21) = bastmsp.rep|x
-Kill(22) = batbtit.msk|x
-Kill(23) = batbcve.msk|x
-Kill(24) = batbivd.msk|x
-Kill(25) = batbscc.msk|x
-Kill(26) = bastcfi.rep|x
-Kill(27) = batbarb.msk|x
-Kill(28) = bastver.rep|x
-Kill(29) = bastleg.msk|x
-Kill(30) = bastzon.rep|x
-Kill(31) = bastleg.rep|x
-Kill(32) = bastcam.rep|x
-Kill(33) = batblia.msk|x
-Kill(34) = batbzon.msk|x
-Kill(35) = bastvet.rep|x
+Kill(21) = bastmsp.msk|x
+Kill(22) = bastnot.msk|x
+Kill(23) = batbcam.msk|x
+Kill(24) = bastpor.rep|x
+Kill(25) = batbpdb.msk|x
+Kill(26) = batbins.msk|x
+Kill(27) = bastscc.rep|x
+Kill(28) = bastvet.rep|x
+Kill(29) = bastpdb.msk|x
+Kill(30) = batbesc.msk|x
+Kill(31) = bastleg.msk|x
+Kill(32) = bastivd.msk|x
+Kill(33) = batbdpn.msk|x
+Kill(34) = bastdpn.rep|x
+Kill(35) = batbmsp.msk|x
 Kill(36) = bastdpn.msk|x
-Kill(37) = bastivd.msk|x
-Kill(38) = bastarb.rep|x
-Kill(39) = bastcam.msk|x
-Kill(40) = bastntb.msk|x
-Kill(41) = bastivd.rep|x
-Kill(42) = bastdpn.rep|x
-Kill(43) = bastpdb.msk|x
-Kill(44) = batbinl.msk|x
-Kill(45) = bastesc.rep|x
+Kill(37) = bastcve.rep|x
+Kill(38) = bastesc.rep|x
+Kill(39) = batbdel.msk|x
+Kill(40) = bastver.rep|x
+Kill(41) = bastcam.msk|x
+Kill(42) = batbreg.msk|x
+Kill(43) = bastivd.rep|x
+Kill(44) = batbnot.msk|x
+Kill(45) = bastntb.msk|x
 Kill(46) = bastreg.msk|x
-Kill(47) = batbreg.msk|x
-Kill(48) = bastzon.msk|x
-Kill(49) = bastarb.msk|x
-Kill(50) = batblia.msk|x
-Kill(51) = cgtbcon.msk|x
-Kill(52) = batbnot.msk|x
-Kill(53) = batbdel.msk|x
-Kill(54) = batbvet.msk|x
-Kill(55) = batbtra.msk|x
+Kill(47) = batbzon.msk|x
+Kill(48) = batbtra.msk|x
+Kill(49) = bastcfi.msk|x
+Kill(50) = bastarb.rep|x
+Kill(51) = bastarb.msk|x
+Kill(52) = bastpdb.rep|x
+Kill(53) = cgtbcon.msk|x
+Kill(54) = batbver.msk|x
+Kill(55) = batblia.msk|x
 Kill(56) = bastnot.rep|x
-Kill(57) = bastpdb.rep|x
-Kill(58) = bastscc.msk|x
-Kill(59) = bastcco.rep|x
-Kill(60) = batbntb.msk|x
-Kill(61) = bastvet.msk|x
-Kill(62) = batbver.msk|x
-Kill(63) = bastcfi.msk|x
-Kill(64) = batblbu.msk|x
-Kill(65) = bastntb.rep|x
-Kill(66) = bastcve.msk|x
-Kill(67) = bastndo.rep|x
-Kill(68) = bastnot.msk|x
-Kill(69) = bastpor.rep|x
+Kill(57) = batbinl.msk|x
+Kill(58) = bastver.msk|x
+Kill(59) = batbcco.msk|x
+Kill(60) = bastcam.rep|x
+Kill(61) = bastcfi.rep|x
+Kill(62) = batbscc.msk|x
+Kill(63) = batbcfi.msk|x
+Kill(64) = bastzon.rep|x
+Kill(65) = batbivd.msk|x
+Kill(66) = batbpor.msk|x
+Kill(67) = bastleg.rep|x
+Kill(68) = batblia.msk|x
+Kill(69) = batbarb.msk|x
 
 [cg]
-Data = 25-06-2019
+Data = 26-06-2019
 Descrizione = Contabilita' Generale
 Dischi = 1
 Moduli = ba

cd/test/fp0844.txt

@@ -1,3 +1,9 @@
 fp0.exe
+fp0400a.msk
+fp0500a.msk
 
 Aggiunta esportazione percentuale e natura iva per f1
+Corretto calcolo ritenute fiscali se piu di una
+Aggiunta colonna ritenute fiscali nel monitor passive
+Sistemata maschera fp0500 per lo sheet "altri dati gestionali"
+Corretta esportazione altri dati gestionali

cd/test/fp0844a.ini

@@ -3,11 +3,13 @@ Demo=0
 
 [fp1]
 File(0) = fp0.exe|X
-Patch = 0844
+File(4) = fp0400a.msk|X
+File(5) = fp0500a.msk|X
+Patch = 844
 Versione = 21511200
 
 [fp]
-Data = 25-06-2019
+Data = 26-06-2019
 Descrizione = Fattura Elettronica
 Dischi = 1
 Moduli = cg,ve