From aae20014791c4654c03d74e65318343941f482f2 Mon Sep 17 00:00:00 2001 From: guy Date: Mon, 21 Feb 2011 14:15:09 +0000 Subject: [PATCH] Patch level : 10.0 Files correlati : cg2.exe Ricompilazione Demo : [ ] Commento : 0001761: eliminazione movimento contabile se si richiama un movimento contabile dal mastrino e poi si fa elimina,va in errore il cg2.exe MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sarebbe possibile evitare di accendere il bottone elimina (come giĆ  fa con i bottoni avanti ed indietro) quando si arriva dal mastrino? git-svn-id: svn://10.65.10.50/branches/R_10_00@21689 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- include/relapp.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/relapp.cpp b/include/relapp.cpp index f7947b30e..5b07a1fcf 100755 --- a/include/relapp.cpp +++ b/include/relapp.cpp @@ -259,6 +259,7 @@ void TRelation_application::set_toolbar() { const int mode = _mask->mode(); const bool can_edit_some = user_can_write(NULL); + const bool can_nav = _lnflag == 0 && _curr_transaction != TRANSACTION_LINK; int pos = _mask->id2pos(DLG_SAVEREC); if (pos >= 0) @@ -271,7 +272,7 @@ void TRelation_application::set_toolbar() pos = _mask->id2pos(DLG_DELREC); if (pos >= 0) { - bool enabdel = (mode == MODE_QUERY && can_edit_some) || (mode == MODE_MOD); + bool enabdel = ((mode == MODE_QUERY && can_edit_some) || (mode == MODE_MOD)) && can_nav; if (enabdel && mode == MODE_MOD) { TRelation& r = *get_relation(); @@ -290,7 +291,6 @@ void TRelation_application::set_toolbar() const long recno = get_relation()->lfile().recno(); const bool enable_next_prev = _mask->edit_mode(); - const bool can_nav = _lnflag == 0 && _curr_transaction != TRANSACTION_LINK; pos = _mask->id2pos(DLG_FIRSTREC); if (pos >= 0)