From 4748c283df5ef7e3f2b1d46bb02783675752b5d5 Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 29 May 1995 16:19:44 +0000 Subject: [PATCH] Corretto controllo sulla cancellazione dei sottoconti git-svn-id: svn://10.65.10.50/trunk@1410 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- cg/cg0100.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/cg/cg0100.cpp b/cg/cg0100.cpp index 62019f5ee..0bc447a99 100755 --- a/cg/cg0100.cpp +++ b/cg/cg0100.cpp @@ -1,6 +1,7 @@ #include #include #include +#include #include "cg0.h" #include "cg0100.h" @@ -121,8 +122,17 @@ bool CG0100_application::protected_record(TRectype &rec) _saldi->put(PCN_CONTO, conto); _saldi->put(PCN_SOTTOCONTO, sottoc); _saldi->read(_isgteq); - - return _saldi->good() && gruppo ==_saldi->get_int(PCN_GRUPPO) && + bool ok = FALSE; + + if (_saldi->good()) + ok = _saldi->get_real(SLD_SALDO) != ZERO || + _saldi->get_real(SLD_PDARE) != ZERO || + _saldi->get_real(SLD_PAVERE) != ZERO || + _saldi->get_real(SLD_PDARESCA) != ZERO || + _saldi->get_real(SLD_PAVERESCA) != ZERO || + _saldi->get_real(SLD_PDAREPRO) != ZERO || + _saldi->get_real(SLD_PAVEREPRO) != ZERO; + return ok && gruppo ==_saldi->get_int(PCN_GRUPPO) && conto ==_saldi->get_int(PCN_CONTO) && sottoc ==_saldi->get_long(PCN_SOTTOCONTO); }