diff --git a/cg/cg4305.cpp b/cg/cg4305.cpp index 0eaaeb6a1..9e0db2376 100755 --- a/cg/cg4305.cpp +++ b/cg/cg4305.cpp @@ -50,7 +50,7 @@ bool TLiquidazione_app::set_deleghe() _ditte->check(-1); for (j = 0l; j < _ditte->items(); j++) - if (_ditte->checked(j) && !_ditte->disabled(j)) + if (_ditte->checked(j) && !_ditte->row_disabled(j)) _selected.set(j); _calcall = TRUE; k = K_ENTER; @@ -83,7 +83,7 @@ bool TLiquidazione_app::extract_deleghe() if (_prind->iscancelled()) break; - if (!(_calcall || _selected[l]) || _ditte->disabled(l)) + if (!(_calcall || _selected[l]) || _ditte->row_disabled(l)) continue; TApplication::set_firm(atol(_ditte->row(l).get(1))); @@ -110,8 +110,9 @@ bool TLiquidazione_app::extract_deleghe() // (_month == 13 && (mens || _isbenzinaro)); _isriepilogo = _month == 13; _isendliq = _isannual || _isriepilogo; - - extract_delega(_month, desc); + + if (mens || _isbenzinaro || _month!=12) + extract_delega(_month, desc); } _prind->addstatus(1); } @@ -340,7 +341,7 @@ bool TLiquidazione_app::set_acconto(real& inf, real& ina) case BUT_CGC_ALL: _ditte->check(-1); for (j = 0l; j < _ditte->items(); j++) - if (_ditte->checked(j) && !_ditte->disabled(j)) + if (_ditte->checked(j) && !_ditte->row_disabled(j)) _selected.set(j); _calcall = TRUE; k = K_ENTER; @@ -369,7 +370,7 @@ bool TLiquidazione_app::recalc_acconti(real& inf, real& ina) { if (_prind->iscancelled()) break; - if ((_calcall || _selected[l]) && !_ditte->disabled(l)) + if ((_calcall || _selected[l]) && !_ditte->row_disabled(l)) { if (onemade == FALSE && _isprint) { @@ -519,7 +520,7 @@ bool TLiquidazione_app::recalc_acconto(real& inf, real& ina) if (bc.sign() > 0) //debito { - acc = bc * _ver->get(isdifferita ? B_LIQ_DIFF : B_LIQ_NORM); + acc = (bc * _ver->get(isdifferita ? B_LIQ_DIFF : B_LIQ_NORM))/CENTO; acc.round(ROUND_LIRA); }