From a18d53486c754dd2700e4fa1c4928dc4e62d4e15 Mon Sep 17 00:00:00 2001 From: bonazzi Date: Tue, 30 May 2017 15:26:35 +0000 Subject: [PATCH] Patch level : 12.0 404 Files correlati : cg4.exe Corretta la stampa dei progressivi sul registro (opengroup). Corretti i progressivi delle aliquote esenti e non imponibili nella 13 liquidazione git-svn-id: svn://10.65.10.50/branches/R_10_00@23850 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- src/cg/cg4301.cpp | 2 +- src/cg/cg4400.cpp | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/cg/cg4301.cpp b/src/cg/cg4301.cpp index ab4ec7aff..7fec88614 100755 --- a/src/cg/cg4301.cpp +++ b/src/cg/cg4301.cpp @@ -1890,7 +1890,7 @@ void TLiquidazione_app::recalc_att(int month, const char* codatt, TAssoc_array & real imponibile = is_detraibile == 0 ? impon_det : impon_ind; real imposta = is_detraibile == 0? impos_det : impos_ind; const TDate datareg = _mov->get_date(MOV_DATAREG); - const bool ok = is_month_ok(month, datareg.month()) && (atoi(_year) == datareg.year()); + const bool ok = (is_month_ok(month, datareg.month()) || month == 13) && (atoi(_year) == datareg.year()); if (civa.senza_imposta() && !ok) continue; diff --git a/src/cg/cg4400.cpp b/src/cg/cg4400.cpp index 900bc4642..0688d33bc 100755 --- a/src/cg/cg4400.cpp +++ b/src/cg/cg4400.cpp @@ -1265,7 +1265,7 @@ bool TStampa_registri_app::controlla_mov() tiporeg tipo; TRecnotype rec = _tabreg->recno(); - for (mov.first(); !mov.eof(); mov.next()) + for (mov.first(); ok && !mov.eof(); mov.next()) { const TString4 reg = mov.get(MOV_REG); if (reg.empty()) continue; //non e' un movimento iva @@ -1321,8 +1321,7 @@ int TStampa_registri_app::stampa_prospetto_IVA(int rr, int tipo_prosp) set_row(rr++, riga); */ - _stampa = _st_tot_fin; - if (_stampa) + if (_st_tot_fin) { set_row(++rr, FR("Tipo documento@54gTotale documento")); rr+=2; @@ -1337,7 +1336,7 @@ int TStampa_registri_app::stampa_prospetto_IVA(int rr, int tipo_prosp) _doc_array.destroy(); } - if (_stampa && _tipo_reg == acquisto) + if (_st_tot_fin && _tipo_reg == acquisto) { if (_stampa_cred_pre && _datareg.month() == 1 && _credito > ZERO) {