diff --git a/cg/cg5200.cpp b/cg/cg5200.cpp index 4dc77fe74..dcb91f3cc 100755 --- a/cg/cg5200.cpp +++ b/cg/cg5200.cpp @@ -447,6 +447,7 @@ void TSaldibrowse_application::compilasheet() char flagsal = ' '; char flagfin = ' '; real saldo = ZERO; + real saldocompl = ZERO; // real saldosca = ZERO; real saldopro = ZERO; // real saldo_gc = ZERO; @@ -515,9 +516,15 @@ void TSaldibrowse_application::compilasheet() saldo = pdare + saldoini - pavere; else saldo = pdare - saldoini - pavere; + + if (flagfin == 'D') + saldocompl = saldo + saldofin; + else + saldocompl = saldo - saldofin; + 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); } } @@ -533,7 +540,16 @@ void TSaldibrowse_application::compilasheet() saldofin = riga.get_real(SLD_SALDOFIN); pdare = riga.get_real(SLD_PDARE); 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); paverepro = riga.get_real(SLD_PAVEREPRO); saldopro = pdarepro - paverepro; @@ -559,7 +575,7 @@ void TSaldibrowse_application::compilasheet() } // 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); } _riga.destroy();