From b2a41bf7320ac71f5ba56859292dddb2aebd872d Mon Sep 17 00:00:00 2001
From: Alessandro Bonazzi <alexbonazzi5652@gmail.com>
Date: Tue, 26 Nov 2024 22:57:01 +0100
Subject: [PATCH] Patch level         : 01.00 1372 Files correlati     :
 ve0.exe Commento: Inviati a db G1 DATAAGG UTENTE e RG1

---
 src/ve/ve0100.cpp  | 65 ++++++++++++++++++++++++++++++++++++----------
 src/ve/ve0100.h    |  5 ++--
 src/ve/velib03.cpp |  1 +
 3 files changed, 56 insertions(+), 15 deletions(-)

diff --git a/src/ve/ve0100.cpp b/src/ve/ve0100.cpp
index 3962348a9..81081c5ff 100755
--- a/src/ve/ve0100.cpp
+++ b/src/ve/ve0100.cpp
@@ -881,6 +881,7 @@ void TMotore_application::sheet2ini(TSheet_field &sheet,TConfig& ini)
     defpar.format("%d,%d",LF_RIGHEDOC,r);
     const TMask* sm = m.riga_mask(r-1);
     const TToken_string& rigar = sheet.row(r-1);
+
     for (int sf = 0; sf < sm->fields(); sf++)
     {
       TMask_field& campo = sm->fld(sf);
@@ -921,20 +922,29 @@ void TMotore_application::sheet2ini(TSheet_field &sheet,TConfig& ini)
 				}
 				campo.field()->write(ini, defpar, str);
       } 
-			const TRiga_documento &rdoc = m.doc()[r];
-			TFieldref f;
-
-			f = RDOC_DACODNUM;
-			f.write(ini, defpar, rdoc.get(RDOC_DACODNUM));
-			f = RDOC_DAANNO;
-			f.write(ini, defpar, rdoc.get(RDOC_DAANNO));
-			f = RDOC_DAPROVV;
-			f.write(ini, defpar, rdoc.get(RDOC_DAPROVV));
-			f = RDOC_DANDOC;
-			f.write(ini, defpar, rdoc.get(RDOC_DANDOC));
-			f = RDOC_DAIDRIGA;
-			f.write(ini, defpar, rdoc.get(RDOC_DAIDRIGA));
     } 
+		
+		TRiga_documento &rdoc = m.doc()[r];
+		TFieldref f;
+
+		f = RDOC_DACODNUM;
+		f.write(ini, defpar, rdoc.get(RDOC_DACODNUM));
+		f = RDOC_DAANNO;
+		f.write(ini, defpar, rdoc.get(RDOC_DAANNO));
+		f = RDOC_DAPROVV;
+		f.write(ini, defpar, rdoc.get(RDOC_DAPROVV));
+		f = RDOC_DANDOC;
+		f.write(ini, defpar, rdoc.get(RDOC_DANDOC));
+		f = RDOC_DAIDRIGA;
+		f.write(ini, defpar, rdoc.get(RDOC_DAIDRIGA));
+
+		if (m.insert_mode())
+			rdoc.update_memo();
+
+		TString rg1 = rdoc.get(RDOC_RG1);
+
+		rg1.replace("\n", "|");
+		ini.set(RDOC_RG1, rg1);
   } 
   for ( ; ; r++)
   {
@@ -1218,6 +1228,35 @@ void TMotore_application::ini2mask(TConfig& ini, TMask& msk, bool query)
   }
 }
 
+void TMotore_application::mask2ini(const TMask& m, TConfig& ini)
+{
+	TDocumento_mask & docmask = (TDocumento_mask &)m;
+	TDocumento & d = docmask.doc();
+
+	TRelation_application::mask2ini(m, ini); // Default processing
+	ini.set_paragraph("33");
+	if (m.insert_mode())
+	{
+		d.update_memo();
+
+		TString g1 = d.get(DOC_G1);
+
+		g1.replace("\n", "|");
+		ini.set(DOC_G1, g1);
+		ini.set(DOC_UTENTE, user());
+		ini.set(DOC_DATAAGG, today);
+	}
+	else
+	{
+		TString g1 = d.get(DOC_G1);
+
+		g1.replace("\n", "|");
+		ini.set(DOC_G1, g1);
+		ini.set(DOC_DATAAGG, d.get(DOC_DATAAGG));
+		ini.set(DOC_UTENTE, d.get(DOC_UTENTE));
+	}
+}
+
 bool TMotore_application::save_and_print(bool savedoc, TPrtype mode)
 {
   static bool already_printing = false;
diff --git a/src/ve/ve0100.h b/src/ve/ve0100.h
index c37badcc4..426d2ba27 100755
--- a/src/ve/ve0100.h
+++ b/src/ve/ve0100.h
@@ -76,8 +76,9 @@ protected:
   static bool tdoc_handler(TMask_field& f, KEY key);
 
   // caricamento Inifile
-  virtual void sheet2ini(TSheet_field& s, TConfig& ini);
-  virtual void ini2mask(TConfig& ini, TMask& m, bool query);
+  virtual void sheet2ini(TSheet_field& s, TConfig& ini) override;
+  virtual void ini2mask(TConfig& ini, TMask& m, bool query) override;
+	virtual void mask2ini(const TMask& m, TConfig& ini) override;
 
   virtual bool last_doc(char provv, int anno, const char* codnum, long& ndoc, TDate& datadoc) const;
   bool save_and_print(bool savedoc, TPrtype mode);
diff --git a/src/ve/velib03.cpp b/src/ve/velib03.cpp
index 331640da0..43cb41a10 100755
--- a/src/ve/velib03.cpp
+++ b/src/ve/velib03.cpp
@@ -1352,6 +1352,7 @@ int TDocumento::write_rewrite(TBaseisamfile & f, bool re) const
     myself.put(DOC_DATAAGG, TDate(TODAY));
   
     const bool check_movmag = _has_mag && tipo().mov_mag();
+
     if (check_movmag)
     {           
       const bool do_movmag = tipo().stato_with_mov_mag(stato_doc) && get(DOC_CAUSMAG).full();