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

Correzioni XI e altro

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@2879 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
villa 1996-05-21 10:47:41 +00:00
parent e1d6c89851
commit ef3e445516
3 changed files with 44 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cg/cg0100.cpp
View File

@ -169,10 +169,7 @@ bool CG0100_application::protected_record(TRectype &rec)
ok = _saldi->get_real(SLD_SALDO) != ZERO ||
_saldi->get_real(SLD_PDARE) != ZERO ||
_saldi->get_real(SLD_PAVERE) != ZERO ||
<<<<<<< cg0100.cpp
_saldi->get_real(SLD_SALDOFIN) != ZERO ||
=======
>>>>>>> 1.22
_saldi->get_real(SLD_PDAREPRO) != ZERO ||
_saldi->get_real(SLD_PAVEREPRO) != ZERO;
ok &= (gruppo ==_saldi->get_int(PCN_GRUPPO) &&

2
cg/cg4300a.uml
View File

@ -124,7 +124,7 @@ END
BOOLEAN CG43_CHK_FINAL
BEGIN
PROMPT 47 11 "Solo stampa"
PROMPT 45 11 "Solo stampa"
HELP "Indicare se si desidera la sola stampa delle liquidazioni calcolate"
MESSAGE TRUE DISABLE,CG43_LST_CALC
MESSAGE FALSE ENABLE,CG43_LST_CALC

2
cg/cg4600.cpp
View File

@ -1210,7 +1210,7 @@ void CG4600_application::chiudi_attivita()
_saldi->setkey(1);
// TString sldstr = _saldo.string();
if (_saldo == ZERO) continue;
if (_saldo == ZERO) continue; // *** TBC qui fa ciclo infinito
numrig++;