root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corretto errore ricalcolo ditte mensili

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@537 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
villa 1994-11-07 07:48:09 +00:00
parent f5135bdd60
commit d3f058f37b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cg/cg4301.cpp
View File

@ -32,6 +32,7 @@ bool CG4300_App::recalc_all()
_prind->addstatus(1); _prind->addstatus(1);
// trimestrali impropriamente selezionate per mesi intermedi // trimestrali impropriamente selezionate per mesi intermedi
_freqviva = look_lia() ? _lia->get("S7") : _nditte->curr().get("FREQVIVA");
if (!is_month_ok(_month)) continue; if (!is_month_ok(_month)) continue;
int need_refresh = FALSE; 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"); _isviaggio = _nditte->curr(LF_ATTIV).get_bool("REG74TER");
_isagricolo = _nditte->curr(LF_ATTIV).get_bool("REGAGR"); _isagricolo = _nditte->curr(LF_ATTIV).get_bool("REGAGR");
_isbenzinaro = _nditte->curr(LF_ATTIV).get_bool("ART74/4"); _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"; bool mens = _freqviva == "M";
_isannual = (_month == 12 && !mens && !_isbenzinaro) || _isannual = (_month == 12 && !mens && !_isbenzinaro) ||
(_month == 13 && (mens || _isbenzinaro)); (_month == 13 && (mens || _isbenzinaro));
_isriepilogo = _month == 13; _isriepilogo = _month == 13;
for (_reg->first(); !_isvent && _reg->good(); _reg->next()) for (_reg->first(); !_isvent && _reg->good(); _reg->next())
{ {
if (codatt == _reg->get("S8") && _reg->get_int("I0") == 2) if (codatt == _reg->get("S8") && _reg->get_int("I0") == 2)