From e80c7cee3afc5cb061cdc95b41544850e2b6bd55 Mon Sep 17 00:00:00 2001
From: Alessandro Bonazzi <alexbonazzi5652@gmail.com>
Date: Sat, 1 Oct 2022 23:39:25 +0200
Subject: [PATCH] Patch level         : 12.0 1198 Files correlati     : cg2.exe
 ve0.exe

Commento:
aggiunti campi per  memorizzare documenti generici e documenti cartacei da archiviare
---
 src/ve/ve0100.cpp  |  2 +-
 src/ve/ve0100.h    |  2 +-
 src/ve/velib06.cpp | 18 +++++++++++-------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/ve/ve0100.cpp b/src/ve/ve0100.cpp
index f384af3b3..3e388e0c9 100755
--- a/src/ve/ve0100.cpp
+++ b/src/ve/ve0100.cpp
@@ -325,7 +325,7 @@ bool TMotore_application::changing_mask( int mode )
   return change;
 }
 
-TMask* TMotore_application::get_mask( int mode )
+TMask* TMotore_application::_get_mask( int mode )
 {
   if (mode != MODE_INS && mode != MODE_MOD)
     return _msk;
diff --git a/src/ve/ve0100.h b/src/ve/ve0100.h
index 7e974e063..c37badcc4 100755
--- a/src/ve/ve0100.h
+++ b/src/ve/ve0100.h
@@ -43,7 +43,7 @@ protected:
   virtual bool user_create();
   virtual bool user_destroy();
   virtual bool menu(MENU_TAG mt);
-  virtual TMask* get_mask(int mode);
+  virtual TMask* _get_mask(int mode);
   virtual bool changing_mask(int mode);
 	bool can_make_doc_def();
   virtual void init_query_mode(TMask& m);
diff --git a/src/ve/velib06.cpp b/src/ve/velib06.cpp
index 5c6129315..8dcae9b89 100755
--- a/src/ve/velib06.cpp
+++ b/src/ve/velib06.cpp
@@ -862,16 +862,20 @@ void TDocumento_mask::update_progs(bool stop_run)
 		{
 			const TMask_field & mf = fld(f);
 			const int id = mf.dlg();
-			const int field_page = mf.page();
 
-			if ((page == field_page || stop_run) && id > BASE_PIEDE)
+			if (id > BASE_PIEDE)
 			{
-				const TFieldref* recfld = mf.field();
-				if (recfld != NULL)
+				const int field_page = mf.page();
+
+				if (page == field_page || stop_run)
 				{
-					const TString & name = recfld->name();
-					const TString& val = doc().get(name);
-					set(id, val, true);
+					const TFieldref* recfld = mf.field();
+					if (recfld != NULL)
+					{
+						const TString & name = recfld->name();
+						const TString& val = doc().get(name);
+						set(id, val, true);
+					}
 				}
 			}
 		}