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

Patch level : 12.0 434

Browse Source 
Files correlati     : ri0.exe

Risistemato trasferimento saldi

git-svn-id: svn://10.65.10.50/branches/R_10_00@24052 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
bonazzi 2017-08-28 22:20:11 +00:00
parent d0c80d0b9b
commit b6fe090da8
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/ri/rilib01.cpp
View File

@ -227,12 +227,19 @@ void TSaldo_periodo::update(char tcf, int gruppo, int conto, long sottoconto, bo
_movimentato |= sal.movimentato();
for (int i = 0; i < nper; i++)
{
si[i] = sld;
pa[i] += sal.progavere(i);
pd[i] += sal.progdare(i);
if (!prog)
sld = ZERO;
sld += sal.progdare(i) - sal.progavere(i);
if (prog)
{
si[i] = sal.saldoini();
pa[i] += sal.progavere(i);
pd[i] += sal.progdare(i);
}
else
{
si[i] = sld;
pa[i] = sal.progavere(i);
pd[i] = sal.progdare(i);
}
sld += pd[i] - pa[i];
sf[i] = sld;
}
for (int i = 0; i < nper; i++)
@ -255,12 +262,19 @@ void TSaldo_periodo::update(char tcf, int gruppo, int conto, long sottoconto, bo
_movimentato = sal.movimentato();
for (int i = 0; i < nper; i++)
{
saldoini(i) = sld;
if (!prog)
sld = ZERO;
pavere(i) = sal.progavere(i);
pdare(i) = sal.progdare(i);
sld += sal.progdare(i) - sal.progavere(i);
if (prog)
{
saldoini(i) = sal.saldoini();
pavere(i) += sal.progavere(i);
pdare(i) += sal.progdare(i);
}
else
{
saldoini(i) = sld;
pavere(i) = sal.progavere(i);
pdare(i) = sal.progdare(i);
}
sld += pdare(i).as_real() - pavere(i).as_real();
saldo(i) = sld;
}
}