From d3f058f37bc34638b50c03df22b9f422d59920a0 Mon Sep 17 00:00:00 2001 From: villa Date: Mon, 7 Nov 1994 07:48:09 +0000 Subject: [PATCH] Corretto errore ricalcolo ditte mensili git-svn-id: svn://10.65.10.50/trunk@537 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- cg/cg4301.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cg/cg4301.cpp b/cg/cg4301.cpp index df3f497c6..8168ff420 100755 --- a/cg/cg4301.cpp +++ b/cg/cg4301.cpp @@ -32,6 +32,7 @@ bool CG4300_App::recalc_all() _prind->addstatus(1); // trimestrali impropriamente selezionate per mesi intermedi + _freqviva = look_lia() ? _lia->get("S7") : _nditte->curr().get("FREQVIVA"); if (!is_month_ok(_month)) continue; int need_refresh = FALSE; @@ -143,13 +144,12 @@ bool CG4300_App::update_firm(int month, bool recalc) _isviaggio = _nditte->curr(LF_ATTIV).get_bool("REG74TER"); _isagricolo = _nditte->curr(LF_ATTIV).get_bool("REGAGR"); _isbenzinaro = _nditte->curr(LF_ATTIV).get_bool("ART74/4"); - _freqviva = look_lia() ? _lia->get("S7") : _nditte->curr().get("FREQVIVA"); + // _freqviva = look_lia() ? _lia->get("S7") : _nditte->curr().get("FREQVIVA"); bool mens = _freqviva == "M"; _isannual = (_month == 12 && !mens && !_isbenzinaro) || (_month == 13 && (mens || _isbenzinaro)); _isriepilogo = _month == 13; - for (_reg->first(); !_isvent && _reg->good(); _reg->next()) { if (codatt == _reg->get("S8") && _reg->get_int("I0") == 2)