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())