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

Patch level : 12.0 912

Browse Source 
Files correlati     : cg0200a.msk f17.dir f17.trr ve0.exe ve1.exe ve5.exe ve6.exe
Commento            :

Corretta ricostruzione saldi per clifogiac sulle dotazioni quando l'esercizio è chiuso
This commit is contained in:
Alessandro Bonazzi 2019-12-20 10:59:05 +01:00
parent 08e8473259
commit 31015d542f
1 changed files with 26 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/mg/mglib02a.cpp
View File

@ -255,12 +255,6 @@ void TMov_mag::set_body_key(TRectype & rowrec)
rowrec.put(RMOVMAG_NUMREG,get(MOVMAG_NUMREG)); rowrec.put(RMOVMAG_NUMREG,get(MOVMAG_NUMREG));
} }
/*void TMov_mag::load_rows_file(int logicnum)
{
CHECK(logicnum==LF_RMOVMAG,"L'unico file collegabile ai movimenti sono le righe");
TMultiple_rectype::load_rows_file(logicnum);
}*/
int TMov_mag::read(TBaseisamfile& f, word op, word lockop) int TMov_mag::read(TBaseisamfile& f, word op, word lockop)
{ {
_saldi_mag.destroy(); _saldi_mag.destroy();
@ -863,7 +857,7 @@ void TMov_mag::update_balance(TRectype& rec, const char* fieldname, const real&
rec.add(fieldname, val); rec.add(fieldname, val);
else else
rec.add(fieldname, -val); rec.add(fieldname, -val);
} }
} }
struct TBalance_params struct TBalance_params
@ -921,27 +915,7 @@ void reset_clifogiac(TRectype& rec, const TRectype& oldrec, bool closed)
rec.zero(CLIFOGIAC_VALORDC); rec.zero(CLIFOGIAC_VALORDC);
} }
const bool preserve_dot = ini_get_bool(CONFIG_DITTA, "lv", "Aggcong") ||
ini_get_bool(CONFIG_DITTA, "mg", "GESMAG");
if (preserve_dot)
{
if (closed)
{
rec.add(CLIFOGIAC_DOTOD, oldrec.get_real(CLIFOGIAC_DOTOD));
rec.add(CLIFOGIAC_DOTIN, oldrec.get_real(CLIFOGIAC_DOTIN));
rec.add(CLIFOGIAC_DOTTM, oldrec.get_real(CLIFOGIAC_DOTTM));
}
else
{
rec.zero(CLIFOGIAC_DOTOD);
rec.zero(CLIFOGIAC_DOTIN);
rec.zero(CLIFOGIAC_DOTTM);
}
}
else
{
if (closed) if (closed)
{ {
rec.put(CLIFOGIAC_DOTOD, oldrec.get(CLIFOGIAC_DOTOD)); rec.put(CLIFOGIAC_DOTOD, oldrec.get(CLIFOGIAC_DOTOD));
@ -954,7 +928,6 @@ void reset_clifogiac(TRectype& rec, const TRectype& oldrec, bool closed)
rec.zero(CLIFOGIAC_DOTIN); rec.zero(CLIFOGIAC_DOTIN);
rec.zero(CLIFOGIAC_DOTTM); rec.zero(CLIFOGIAC_DOTTM);
} }
}
} }
else else
{ {