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

Corretto errore MI6016 e gestione utilizzo saldo di chiusura.

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@3167 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
angelo 1996-07-08 16:08:44 +00:00
parent f07494527c
commit 900f244520
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cg/cg5200.cpp
View File

@ -447,6 +447,7 @@ void TSaldibrowse_application::compilasheet()
char flagsal = ' '; char flagsal = ' ';
char flagfin = ' '; char flagfin = ' ';
real saldo = ZERO; real saldo = ZERO;
real saldocompl = ZERO;
// real saldosca = ZERO; // real saldosca = ZERO;
real saldopro = ZERO; real saldopro = ZERO;
// real saldo_gc = ZERO; // real saldo_gc = ZERO;
@ -515,9 +516,15 @@ void TSaldibrowse_application::compilasheet()
saldo = pdare + saldoini - pavere; saldo = pdare + saldoini - pavere;
else else
saldo = pdare - saldoini - pavere; saldo = pdare - saldoini - pavere;
if (flagfin == 'D')
saldocompl = saldo + saldofin;
else
saldocompl = saldo - saldofin;
saldopro = pdarepro - paverepro; saldopro = pdarepro - paverepro;
add_r(i,anno,saldofin,flagfin,saldo,flagsal,saldoini,pdare,pavere,saldo, add_r(i,anno,saldofin,flagfin,saldocompl,flagsal,saldoini,pdare,pavere,saldo,
ultima_data,ultimo_num,pdarepro,paverepro,saldopro,pdaresca, paveresca); ultima_data,ultimo_num,pdarepro,paverepro,saldopro,pdaresca, paveresca);
} }
} }
@ -533,7 +540,16 @@ void TSaldibrowse_application::compilasheet()
saldofin = riga.get_real(SLD_SALDOFIN); saldofin = riga.get_real(SLD_SALDOFIN);
pdare = riga.get_real(SLD_PDARE); pdare = riga.get_real(SLD_PDARE);
pavere = riga.get_real(SLD_PAVERE); pavere = riga.get_real(SLD_PAVERE);
saldo = pdare - pavere + saldoini; if (flagsal == 'D')
saldo = pdare + saldoini - pavere;
else
saldo = pdare - saldoini - pavere;
if (flagfin == 'D')
saldocompl = saldo + saldofin;
else
saldocompl = saldo - saldofin;
pdarepro = riga.get_real(SLD_PDAREPRO); pdarepro = riga.get_real(SLD_PDAREPRO);
paverepro = riga.get_real(SLD_PAVEREPRO); paverepro = riga.get_real(SLD_PAVEREPRO);
saldopro = pdarepro - paverepro; saldopro = pdarepro - paverepro;
@ -559,7 +575,7 @@ void TSaldibrowse_application::compilasheet()
} }
// come sopra // come sopra
add_r(j,anno,saldofin,flagfin,saldo,flagsal,saldoini,pdare,pavere,saldo,ultima_data, add_r(j,anno,saldofin,flagfin,saldocompl,flagsal,saldoini,pdare,pavere,saldo,ultima_data,
ultimo_num,pdarepro,paverepro,saldopro, pdaresca, paveresca); ultimo_num,pdarepro,paverepro,saldopro, pdaresca, paveresca);
} }
_riga.destroy(); _riga.destroy();