diff --git a/cd/test/ba0794.txt b/cd/test/ba0794.txt new file mode 100644 index 000000000..ea7dcbcd4 --- /dev/null +++ b/cd/test/ba0794.txt @@ -0,0 +1,5 @@ +recdesc\f20.trr +recdesc\f20.dir + +Issue #33 +Aumentata a 80 caratteri la lunghezza del campo PEC \ No newline at end of file diff --git a/cd/test/ba0794a.ini b/cd/test/ba0794a.ini new file mode 100644 index 000000000..6fa20adbf --- /dev/null +++ b/cd/test/ba0794a.ini @@ -0,0 +1,32 @@ +[Main] +Demo=0 + +[ba2] +File(366) = recdesc\f20.dir|X +File(367) = recdesc\f20.trr|X +Patch = 0794 +Versione = 21511200 + +[ba99] +Kill(0) = batbsce.txt|x +Kill(1) = wxmsw240.dll|x +Kill(2) = bastcms.rep|x +Kill(3) = bastcms.msk|x +Kill(4) = bastfsc.msk|x +Kill(5) = bastfsc.rep|x +Kill(6) = bastuue.msk|x +Kill(7) = bastuue.rep|x + +[ba] +Data = 21-05-2019 +Descrizione = Base +Dischi = 1 +Moduli = sy +OEM = +Patch = 794 +PostProcess = bainst -0 BA +PreProcess = +Prezzo(1) = +Prezzo(2) = +Versione = 21511200 + diff --git a/cd/test/ba0794a1.zip b/cd/test/ba0794a1.zip new file mode 100644 index 000000000..c2300e129 Binary files /dev/null and b/cd/test/ba0794a1.zip differ diff --git a/cd/test/cg0794.txt b/cd/test/cg0794.txt new file mode 100644 index 000000000..912052cdd --- /dev/null +++ b/cd/test/cg0794.txt @@ -0,0 +1,4 @@ +cg0200a.msk + +Issue #33 +Aumentata a 80 caratteri la lunghezza del campo PEC \ No newline at end of file diff --git a/cd/test/cg0794a.ini b/cd/test/cg0794a.ini new file mode 100644 index 000000000..ba549b856 --- /dev/null +++ b/cd/test/cg0794a.ini @@ -0,0 +1,97 @@ +[Main] +Demo=0 + +[cg9] +Edit_19 = cg0 -0 +Edit_20 = cg0 -1 +Edit_26 = cg0 -4 +Edit_5 = cg0 -5 +File(181) = cg0200a.msk|X +Patch = 794 +Versione = 21511200 + +[cg99] +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) = batbntb.msk|x +Kill(15) = bastver.msk|x +Kill(16) = batbleg.msk|x +Kill(17) = batbdpn.msk|x +Kill(18) = bastcco.rep|x +Kill(19) = bastscc.msk|x +Kill(20) = batbind.msk|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) = bastpdb.rep|x +Kill(35) = bastntb.rep|x +Kill(36) = bastnot.rep|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) = batbinl.msk|x +Kill(43) = bastntb.msk|x +Kill(44) = batbreg.msk|x +Kill(45) = bastcfi.msk|x +Kill(46) = bastreg.msk|x +Kill(47) = batbnot.msk|x +Kill(48) = bastcam.msk|x +Kill(49) = batbcve.msk|x +Kill(50) = cgtbcon.msk|x +Kill(51) = bastndo.msk|x +Kill(52) = batbzon.msk|x +Kill(53) = batbmsp.msk|x +Kill(54) = bastzon.rep|x +Kill(55) = batbdel.msk|x +Kill(56) = bastdpn.msk|x +Kill(57) = bastdpn.rep|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 = 21-05-2019 +Descrizione = Contabilita' Generale +Dischi = 1 +Moduli = ba +OEM = +Patch = 794 +PostProcess = bainst -0 CG +PreProcess = +Prezzo(1) = +Prezzo(2) = +Versione = 21511200 + diff --git a/cd/test/cg0794a1.zip b/cd/test/cg0794a1.zip new file mode 100644 index 000000000..f7b55cc45 Binary files /dev/null and b/cd/test/cg0794a1.zip differ diff --git a/cd/test/sc0792.txt b/cd/test/sc0792.txt new file mode 100644 index 000000000..207d30bba --- /dev/null +++ b/cd/test/sc0792.txt @@ -0,0 +1,4 @@ +pec.frm + +Rifatta una patch. +Il campo 106 dell' (H)eader (O)dd รจ dati pagamento. \ No newline at end of file diff --git a/cd/test/sc0792a.ini b/cd/test/sc0792a.ini new file mode 100644 index 000000000..03c3fea6d --- /dev/null +++ b/cd/test/sc0792a.ini @@ -0,0 +1,21 @@ +[Main] +Demo=0 + +[sc1] +File(0) = pec.frm|X +Patch = 0792 +Versione = 21511200 + +[sc] +Data = 21-05-2019 +Descrizione = Saldaconto +Dischi = 1 +Moduli = +OEM = +Patch = 792 +PostProcess = +PreProcess = +Prezzo(1) = +Prezzo(2) = +Versione = 21511200 + diff --git a/cd/test/sc0792a1.zip b/cd/test/sc0792a1.zip new file mode 100644 index 000000000..94337e970 Binary files /dev/null and b/cd/test/sc0792a1.zip differ diff --git a/cd/test/tf0794.txt b/cd/test/tf0794.txt new file mode 100644 index 000000000..82aae5b85 --- /dev/null +++ b/cd/test/tf0794.txt @@ -0,0 +1,4 @@ +tf0.exe +tf0200a.msk + +Aggiunto flag per elaborazione liquidazione IVA periodica seguendo la data competenza o no diff --git a/cd/test/tf0794a.ini b/cd/test/tf0794a.ini new file mode 100644 index 000000000..8a8b9c63e --- /dev/null +++ b/cd/test/tf0794a.ini @@ -0,0 +1,20 @@ +[Main] +Demo=0 + +[tf1] +File(0) = tf0.exe|X +File(2) = tf0200a.msk|X +Patch = 0794 +Versione = 21511200 + +[tf] +Data = 22-05-2019 +Descrizione = Trasferimento fatture +Dischi = 1 +Moduli = cg +OEM = +Patch = 794 +PostProcess = +PreProcess = +Versione = 21511200 + diff --git a/cd/test/tf0794a1.zip b/cd/test/tf0794a1.zip new file mode 100644 index 000000000..94b3a28b5 Binary files /dev/null and b/cd/test/tf0794a1.zip differ diff --git a/src/cg/cg4301.cpp b/src/cg/cg4301.cpp index 2361e682f..110fb7427 100755 --- a/src/cg/cg4301.cpp +++ b/src/cg/cg4301.cpp @@ -1186,7 +1186,7 @@ void TLiquidazione_app::recalc_att(int month, const char* codatt, TAssoc_array & } #ifdef DBG if (nr == 97882 || nr == 98707) - int i = 1; + int i = 1; #endif const TRectype& rcs = _cur->curr(LF_CAUSALI); const TDate datareg = _mov->get_date(MOV_DATAREG); @@ -1241,7 +1241,7 @@ void TLiquidazione_app::recalc_att(int month, const char* codatt, TAssoc_array & #ifdef DBG if (nr == 97882 || nr == 98707) - int i = 1; + int i = 1; #endif if (fattrit) @@ -1556,7 +1556,7 @@ void TLiquidazione_app::recalc_att(int month, const char* codatt, TAssoc_array & long nr = _mov->get_long(MOV_NUMREG); if (nr == 97882 || nr == 98707) - int i = 1; + int i = 1; #endif if ((soloiva && @@ -4164,10 +4164,10 @@ void TLiquidazione_app::write_liq(int month, const char* codatts) if (!look_pla(att)) continue; - const real vf1 = _pla->get("R14"); - const real vf2 = _pla->get("S1"); - const real iaq = _pla->get("R11"); // IVA acquisti - const real ppg = _pla->get("R12"); // pro-rata pagato + const real vf1 = _pla->get_real("R14"); + const real vf2 = _pla->get_real("S1"); + const real iaq = _pla->get_real("R11"); // IVA acquisti + const real ppg = _pla->get_real("R12"); // pro-rata pagato vol_aff_1 += vf1; vol_aff_2 += vf2; @@ -4187,7 +4187,7 @@ void TLiquidazione_app::write_liq(int month, const char* codatts) const real ris = vf1 + vf2; // gia' esclusi: NS, B3, cess. amm // calcola nuovo prorata dal 1998 per ogni attivita' (miste: 1+2) - const real rsa = ris - (es_c1a-es_c1a_am) - (es_c3-es_c3_am); + const real rsa = ris - (es_c1a-es_c1a_am) - (es_c3-es_c3_am) - ven_rev; const real rsn = rsa - es_c1; if (!rsa.is_zero()) { diff --git a/src/cg/cg4304.cpp b/src/cg/cg4304.cpp index bc5778bc7..a82d04f0b 100755 --- a/src/cg/cg4304.cpp +++ b/src/cg/cg4304.cpp @@ -1164,10 +1164,11 @@ void TLiquidazione_app::describe_pims(int month, const char* codatt, const bool real vrc = _pla->get_real("R18"); // Vendite reverse charge real iaq = _pla->get_real("R11"); // IVA acquisti real ppg = _pla->get_real("R12"); // pro-rata pagato - + real ven_rev = _pla->get_real("R18"); + // calcola nuovo prorata per ogni attivita' (miste: 1+2) real pr; - const real rsa = ris - (e3-e5) - (e4-e6); + const real rsa = ris - (e3-e5) - (e4-e6) - ven_rev; const real rsn = rsa - e1; if (!rsa.is_zero())