From 88e8288d129cbe3877fcee7005eb9efaa0a12e42 Mon Sep 17 00:00:00 2001 From: luca Date: Thu, 20 Nov 2003 11:04:45 +0000 Subject: [PATCH] Patch level :2.0 partners nopatch Files correlati :libs Ricompilazione Demo : [ ] Commento :sistemato annoso problema del codice ditta che spariva in presenza di profili;aggiunto file 145 agli archivi (saldi per commessa) git-svn-id: svn://10.65.10.50/trunk@11608 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- include/lffiles.h | 3 ++- include/mask.cpp | 10 ++++++++-- include/maskfld.h | 4 ++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/include/lffiles.h b/include/lffiles.h index 5d18cbe6f..4bf7c1811 100755 --- a/include/lffiles.h +++ b/include/lffiles.h @@ -86,7 +86,7 @@ #define LF_RETT 81 #define LF_ANALISI 82 #define LF_VOCI 83 -#define LF_RELVOCI 84 +#define LF_RELVOCI 84 #define LF_RELANA 85 #define LF_SVRIEP 86 #define LF_SVSTAT 87 @@ -153,6 +153,7 @@ #define LF_MOVCE 142 #define LF_SALCE 143 #define LF_QUALA 144 +#define LF_SALCECMS 145 #define LF_EXTERNAL 1000 // Files with id >= are considered to be externals diff --git a/include/mask.cpp b/include/mask.cpp index c01b46770..36469a433 100755 --- a/include/mask.cpp +++ b/include/mask.cpp @@ -2066,7 +2066,10 @@ int TMask::save_profile(int num, const char* desc) const ini.set(name, *row, NULL, TRUE, r); } else - ini.set(name, f.get()); + { + if (!f.is_firm()) + ini.set(name, f.get()); + } } } return num; @@ -2103,7 +2106,10 @@ int TMask::load_profile(int num, bool reset) sf.force_update(); } else - f.set(ini.get(name)); + { + if (!f.is_firm()) + f.set(ini.get(name)); + } } } } diff --git a/include/maskfld.h b/include/maskfld.h index fb16edc27..c59c3997f 100755 --- a/include/maskfld.h +++ b/include/maskfld.h @@ -206,6 +206,10 @@ public: void allow_pipe(bool r = TRUE) { _flags.pipeallowed = r; } + // @stabilisce se un campo contiene il codice ditta + bool is_firm() const + { return _flags.firm; } + // @cmember Ritorna il nome della classe virtual const char* class_name() const; // @cmember Ritorna l'identificatore della classe