From e3d6bc759a1d4ac2c7da5e60c2020ade8de12dfb Mon Sep 17 00:00:00 2001 From: guy Date: Tue, 18 Oct 2011 13:17:15 +0000 Subject: [PATCH] Patch level : Files correlati : Ricompilazione Demo : [ ] Commento : Ottimizzazioni per ricalcolo saldi di magazzino git-svn-id: svn://10.65.10.50/branches/R_10_00@22457 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- include/alleg.h | 4 +++- include/prefix.cpp | 2 +- include/relation.cpp | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/alleg.h b/include/alleg.h index b03666711..fefe376db 100755 --- a/include/alleg.h +++ b/include/alleg.h @@ -16,17 +16,19 @@ DEFFLD(OCFPI) DEFFLD(NUMREG) // Can be null // Flags +DEFFLD(FORZATURA) DEFFLD(IGNORA) // Content fields DEFFLD(DATAREG) +DEFFLD(NUMFATT) DEFFLD(MODPAG) DEFFLD(IMPORTO) DEFFLD(IMPOSTA) DEFFLD(TIPOPE) DEFFLD(CONTRATTO) - +DEFFLD(DATARETT) DEFFLD(NUMRETT) #undef DEFFLD diff --git a/include/prefix.cpp b/include/prefix.cpp index b39d87b4c..ac228b635 100755 --- a/include/prefix.cpp +++ b/include/prefix.cpp @@ -428,7 +428,7 @@ int TFile_info::close() if (_ref_count > 0) { _ref_count--; - if (_ref_count == 0 || _exclusive) + if (_ref_count == 0 || (_exclusive && _ref_count < 2)) { if (is_open()) { diff --git a/include/relation.cpp b/include/relation.cpp index 2f2e1a9a9..6cdf17ad7 100755 --- a/include/relation.cpp +++ b/include/relation.cpp @@ -1833,7 +1833,7 @@ bool TCursor::scan(CURSOR_SCAN_FUNC func, void* pJolly, const char* msg) if (tot > 1) { if (msg == NULL || *msg == '\0') - msg = TR("Elaborazione in corso..."); + msg = TR("Elaborazione in corso..."); pi = new TProgind(tot, msg, true, true); }