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

Correzioni Enrica + errori liq.

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@1582 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
villa 1995-07-10 10:37:31 +00:00
parent 403683e090
commit 00b28074d6
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cg/cg4301.cpp
View File

@ -147,7 +147,7 @@ bool TLiquidazione_app::update_firm(int month, bool recalc)
look_lim(liq_month(month), TRUE); look_lim(liq_month(month), TRUE);
if (_isfinal && _lim->get_bool("B1") && _month != 13) if (_isregis && _lim->get_bool("B1") && _month != 13)
return TRUE; return TRUE;
TConfig cnf(CONFIG_DITTA, "cg"); TConfig cnf(CONFIG_DITTA, "cg");
@ -255,9 +255,10 @@ bool TLiquidazione_app::update_firm(int month, bool recalc)
_pla->rewrite(); _pla->rewrite();
} }
for (_reg->first(); _reg->good(); _reg->next()) for (_reg->first(); _reg->good(); _reg->next())
{ {
if (codatt == _reg->get("S8") || quater) if (codatt == _reg->get("S8") || quater) // TBC quater: e' una pezza ma andra' cambiato
{ {
if (!riepliq) riepliq = _reg->get_bool("B6"); if (!riepliq) riepliq = _reg->get_bool("B6");
if (!stliq) stliq = _reg->get_bool("B7"); if (!stliq) stliq = _reg->get_bool("B7");
@ -493,6 +494,9 @@ void TLiquidazione_app::recalc_att(int month, const char* codatt)
const TRectype& rcs = _cur->curr(LF_CAUSALI); const TRectype& rcs = _cur->curr(LF_CAUSALI);
const bool fattrit = rcs.get_bool("RITFATT"); const bool fattrit = rcs.get_bool("RITFATT");
// for degiubbing only
int numreg = _rmoviva->get_int("NUMREG");
if (dok || sreg || rs8 || cmt) continue; if (dok || sreg || rs8 || cmt) continue;
/* /*
@ -1039,7 +1043,7 @@ void TLiquidazione_app::recalc_att(int month, const char* codatt)
_pim->put("R12",fsv); _pim->put("R12",fsv);
_pim->put("I1", (long)tipomov); _pim->put("I1", (long)tipomov);
_pim->put("B3", ivarimb ? "X" : ""); _pim->put("B3", ivarimb ? "X" : "");
_pim->put("B4", _isricacq && was_riv? "X" : ""); _pim->put("B4", (_isricacq && was_riv) ? "X" : "");
_pim->put("S5", tipoiva); _pim->put("S5", tipoiva);
// fatture in ritardo // fatture in ritardo
@ -1076,7 +1080,7 @@ void TLiquidazione_app::recalc_att(int month, const char* codatt)
real perc = _iva->get_real("R0"); real perc = _iva->get_real("R0");
real new_iva = (_pim->get_real("R0") * perc)/CENTO; real new_iva = (_pim->get_real("R0") * perc)/CENTO;
new_iva.round(ROUND_LIRA); new_iva.ceil(ROUND_LIRA); // TBC check ceil
if (new_iva != old_iva) if (new_iva != old_iva)
{ {
@ -1625,8 +1629,6 @@ void TLiquidazione_app::write_liq(int month, const char* codatts)
_lam->rewrite(); _lam->rewrite();
} }
//*
void TLiquidazione_app::recalc_annual(const char* att) void TLiquidazione_app::recalc_annual(const char* att)
{ {
// viene chiamata 2 volte per le att. miste; PLA e' stata // viene chiamata 2 volte per le att. miste; PLA e' stata