diff --git a/cd/test/cg0938.txt b/cd/test/cg0938.txt index fea558a2c..4b9f0393c 100644 --- a/cd/test/cg0938.txt +++ b/cd/test/cg0938.txt @@ -3,5 +3,7 @@ cg5500c.msk cg5500b.msk Attivati acconto e interessi con ricalcolo nei trimestrali. - Aggiunta 13 nei trimestrali e sistemata la visualizzazione dei trimestrali. +Corrette diciture pro rata a da C1 C2 C3 C1a in B1 B2 B3 B4 +Calcolato il pro rata mensile sempre +Detratti gli i beni ammortizzabili esenti venduti nel calcolo pro rata con numeratore e denominatore (da verificare) diff --git a/cd/test/cg0938a.ini b/cd/test/cg0938a.ini index c00fd2f30..a212d1920 100644 --- a/cd/test/cg0938a.ini +++ b/cd/test/cg0938a.ini @@ -9,80 +9,80 @@ Patch = 938 Versione = 21511200 [cg99] -Kill(0) = batbzon.msk|x -Kill(1) = bastdpn.rep|x -Kill(2) = batbinl.msk|x -Kill(3) = bastzon.msk|x -Kill(4) = bastcve.rep|x -Kill(5) = bastntb.rep|x -Kill(6) = bastpdb.rep|x -Kill(7) = bastnot.msk|x -Kill(8) = batbarb.msk|x -Kill(9) = batbnot.msk|x -Kill(10) = batbcve.msk|x -Kill(11) = cg2fppro.msk|x -Kill(12) = bastmsp.rep|x -Kill(13) = bastcco.msk|x -Kill(14) = batbtra.msk|x -Kill(15) = bastvet.msk|x +Kill(0) = bastnot.rep|x +Kill(1) = batbdel.msk|x +Kill(2) = bastreg.msk|x +Kill(3) = bastleg.msk|x +Kill(4) = batbscc.msk|x +Kill(5) = batbcam.msk|x +Kill(6) = cgtbcon.msk|x +Kill(7) = batbcco.msk|x +Kill(8) = bastcve.msk|x +Kill(9) = batbver.msk|x +Kill(10) = bastvet.msk|x +Kill(11) = bastesc.msk|x +Kill(12) = batbtra.msk|x +Kill(13) = batbind.msk|x +Kill(14) = bastmsp.msk|x +Kill(15) = batbesc.msk|x Kill(16) = batbleg.msk|x -Kill(17) = bastmsp.msk|x -Kill(18) = bastleg.msk|x -Kill(19) = bastnot.rep|x -Kill(20) = batbind.msk|x -Kill(21) = bastesc.msk|x -Kill(22) = bastpor.msk|x -Kill(23) = batbesc.msk|x -Kill(24) = batbscc.msk|x -Kill(25) = batbdel.msk|x -Kill(26) = bastcve.msk|x -Kill(27) = cgtbcon.msk|x -Kill(28) = batblia.msk|x -Kill(29) = bastarb.rep|x -Kill(30) = batbcam.msk|x -Kill(31) = bastreg.msk|x -Kill(32) = batbver.msk|x -Kill(33) = batbcco.msk|x -Kill(34) = batblbu.msk|x -Kill(35) = bastcam.msk|x -Kill(36) = bastdpn.msk|x -Kill(37) = bastscc.msk|x -Kill(38) = batbcfi.msk|x +Kill(17) = bastpor.msk|x +Kill(18) = cg2fppro.msk|x +Kill(19) = batbcve.msk|x +Kill(20) = bastcco.msk|x +Kill(21) = bastmsp.rep|x +Kill(22) = batbtit.msk|x +Kill(23) = bastcfi.rep|x +Kill(24) = bastivd.rep|x +Kill(25) = bastreg.rep|x +Kill(26) = bastscc.rep|x +Kill(27) = bastzon.rep|x +Kill(28) = bastleg.rep|x +Kill(29) = bastndo.msk|x +Kill(30) = batbivd.msk|x +Kill(31) = bastvet.rep|x +Kill(32) = bastcam.rep|x +Kill(33) = batblia.msk|x +Kill(34) = bastcfi.msk|x +Kill(35) = batbpdb.msk|x +Kill(36) = bastesc.rep|x +Kill(37) = bastpor.rep|x +Kill(38) = batbndo.msk|x Kill(39) = bastver.rep|x -Kill(40) = batbntb.msk|x -Kill(41) = bastntb.msk|x -Kill(42) = batbreg.msk|x -Kill(43) = bastver.msk|x -Kill(44) = bastndo.rep|x -Kill(45) = batbdpn.msk|x -Kill(46) = batbvet.msk|x -Kill(47) = batbpor.msk|x -Kill(48) = bastcam.rep|x -Kill(49) = bastndo.msk|x -Kill(50) = batbins.msk|x -Kill(51) = batbmsp.msk|x -Kill(52) = bastpdb.msk|x -Kill(53) = bastivd.msk|x -Kill(54) = batblia.msk|x -Kill(55) = batbivd.msk|x -Kill(56) = bastpor.rep|x -Kill(57) = batbpdb.msk|x -Kill(58) = bastivd.rep|x -Kill(59) = batbtit.msk|x -Kill(60) = bastcfi.msk|x -Kill(61) = bastvet.rep|x -Kill(62) = batbndo.msk|x -Kill(63) = bastesc.rep|x -Kill(64) = bastreg.rep|x -Kill(65) = bastcfi.rep|x -Kill(66) = bastleg.rep|x -Kill(67) = bastzon.rep|x -Kill(68) = bastarb.msk|x -Kill(69) = bastcco.rep|x -Kill(70) = bastscc.rep|x +Kill(40) = batbdpn.msk|x +Kill(41) = batbmsp.msk|x +Kill(42) = batbcfi.msk|x +Kill(43) = bastndo.rep|x +Kill(44) = batbins.msk|x +Kill(45) = batbpor.msk|x +Kill(46) = bastivd.msk|x +Kill(47) = batbvet.msk|x +Kill(48) = bastpdb.msk|x +Kill(49) = bastarb.rep|x +Kill(50) = bastcam.msk|x +Kill(51) = bastntb.msk|x +Kill(52) = batblia.msk|x +Kill(53) = batblbu.msk|x +Kill(54) = batbntb.msk|x +Kill(55) = bastscc.msk|x +Kill(56) = bastver.msk|x +Kill(57) = bastdpn.msk|x +Kill(58) = batbreg.msk|x +Kill(59) = bastcco.rep|x +Kill(60) = bastarb.msk|x +Kill(61) = batbnot.msk|x +Kill(62) = batbarb.msk|x +Kill(63) = bastdpn.rep|x +Kill(64) = batbzon.msk|x +Kill(65) = bastntb.rep|x +Kill(66) = bastcve.rep|x +Kill(67) = bastzon.msk|x +Kill(68) = batbinl.msk|x +Kill(69) = bastnot.msk|x +Kill(70) = bastpdb.rep|x [cg] -Data = 31-01-2020 +Data = 10-02-2020 Descrizione = Contabilita' Generale Dischi = 1 Edit_19 = cg0 -0 diff --git a/cd/test/cg0938a1.zip b/cd/test/cg0938a1.zip index 757348fde..64cdcf593 100644 Binary files a/cd/test/cg0938a1.zip and b/cd/test/cg0938a1.zip differ diff --git a/cd/test/tf0938.txt b/cd/test/tf0938.txt new file mode 100644 index 000000000..864884afd --- /dev/null +++ b/cd/test/tf0938.txt @@ -0,0 +1,3 @@ +tf0.exe + +Corretto calcolo liquidazione IVA, data fine sbagliata se dicembre diff --git a/cd/test/tf0938a.ini b/cd/test/tf0938a.ini new file mode 100644 index 000000000..d20085e0c --- /dev/null +++ b/cd/test/tf0938a.ini @@ -0,0 +1,19 @@ +[Main] +Demo=0 + +[tf1] +File(0) = tf0.exe|X +Patch = 0938 +Versione = 21511200 + +[tf] +Data = 10-02-2020 +Descrizione = Trasferimento fatture +Dischi = 1 +Moduli = cg +OEM = +Patch = 938 +PostProcess = +PreProcess = +Versione = 21511200 + diff --git a/cd/test/tf0938a1.zip b/cd/test/tf0938a1.zip new file mode 100644 index 000000000..fc0738d3b Binary files /dev/null and b/cd/test/tf0938a1.zip differ diff --git a/src/tf/tf0200.cpp b/src/tf/tf0200.cpp index 076d0b4e5..9a3eb387b 100644 --- a/src/tf/tf0200.cpp +++ b/src/tf/tf0200.cpp @@ -486,7 +486,17 @@ void TCom_liq_per_iva_msk::extractinator() // Per gli amici GTFO for(; start <= end; start++) { TDate data_da(1, start, anno); - TDate data_a(1, start + 1, anno); data_a.set_end_month(); + TDate data_a; + if (start == 12) + { + data_a = TDate(1, 12, anno); + data_a.set_end_month(); + } + else + { + data_a = TDate(1, start + 1, anno); + data_a.set_end_month(); + } bool has_ixc = gestione_IVAxCassa(data_da); /**************************************************************************************************************** @@ -536,15 +546,17 @@ void TCom_liq_per_iva_msk::extractinator() // Per gli amici GTFO if (tiporeg == iva_acquisti) { - if ((!att_dt_comp || !((month_reg == start && (month_liq == 0 || month_liq == month_reg)) || start == month_liq)) - && (att_dt_comp || cur_iva.get(LF_MOV, MOV_DATAREG).as_date().month() == data_a.month())) - continue; + if ((start == 12 && month_reg != start) || + (start != 12 && ((pas_dt_comp && month_reg != start && (month_liq == month_reg || month_liq == 0)) + || (!pas_dt_comp && month_reg != start)))) + continue; } else { - if ((!pas_dt_comp || !((month_reg == start && (month_liq == 0 || month_liq == month_reg)) || start == month_liq)) - && (pas_dt_comp || cur_iva.get(LF_MOV, MOV_DATAREG).as_date().month() == data_a.month())) - continue; + if ((start == 12 && month_reg != start) || + (start != 12 && ((att_dt_comp && month_reg != start && (month_liq == month_reg || month_liq == 0)) + || (!att_dt_comp && month_reg != start)))) + continue; } // Se รจ un movimento IvaXCassa o LiqDiff