Patch level : 12.0 1216

Files correlati     : f9.exe

Bugfix dopo test archiviazione cartacei

src/f9/f90100.cpp

@@ -84,7 +84,7 @@ int TEstrai_mask::estrai()
 
 		long nreg = mov.get_long(MOV_NUMREG);
 		
-		if (nreg == 20045)
+		if (nreg == 207)
 			int here = 0;
 
 		if (escluso)

src/f9/f9lib01.cpp

@@ -482,6 +482,12 @@ void TEstrazione::copy_file_to_webapp_fld(TMovimento_estr& movimento) const
 			{
 				TFilename dest(base);
 
+				if (file.is_relative_path())
+				{
+					const TString studio = prefix().get_studio();
+					file.insert(studio);
+				}
+
 				if (cd != nullptr && file.full())
 					dest.add(cd->catdoc());
 				else
@@ -879,7 +885,7 @@ const char* TEstrazione::diagnostica_mov()
 
 					const long numreg = mov_i.numreg();
 
-					if (numreg == 20045) {
+					if (numreg == 210) {
 						int here = 0;
 					}
 

src/include/automask.h

@@ -1,7 +1,7 @@
 #ifndef __AUTOMASK_H
 #define __AUTOMASK_H
 
-#ifndef __DEFMASK_H
+#ifndef __DEFMASK_Hautomask
 #include <defmask.h>
 #endif
 

src/include/golem.cpp

@@ -73,6 +73,18 @@ bool print_url(const char* url)
   return ok;
 }  
 
+const TString & get_golem_path(long ditta) 
+{
+	TFilename golem_path;
+	if (ditta < 0)
+		ditta = prefix().get_codditta();
+	golem_path = firm2dir(ditta);
+	golem_path.add("golem");
+	if (!dexist(golem_path))
+		make_dir(golem_path);
+	return  get_tmp_string() = golem_path;
+}
+
 ///////////////////////////////////////////////////////////
 // Maschera GOLEM
 ///////////////////////////////////////////////////////////
@@ -452,12 +464,7 @@ bool TGolem_field::autosave(TRelation& r)
       const int logicnum = r.lfile().num();
       dir.get(logicnum, _nolock, _nordir, _sysdirop);
       const long ditta = dir.is_com() ? 0 : prefix().get_codditta();
-      
+      const TFilename golem_path = get_golem_path(ditta);
-      TFilename golem_path;
-      golem_path = firm2dir(ditta);
-      golem_path.add("golem");
-      if (!dexist(golem_path))
-        make_dir(golem_path);
      
       const int old_items = _old_value.items();
       const int new_items = new_value.items();
@@ -506,6 +513,8 @@ bool TGolem_field::autosave(TRelation& r)
 						}
 
             fcopy(new_file, old_file);
+						if (old_file.starts_with(golem_path))
+							old_file = old_file.mid(golem_path.len());
             new_row.add(old_file, 0);
             new_value.add(new_row, i);
             

src/include/golem.h

@@ -15,6 +15,8 @@ bool print_url(const char* url);
 
 class TMAPI_session;
 
+const TString & get_golem_path(long ditta);
+
 class TMail_message : public TString_array
 {                  
   TString_array _recipients, _copy_recipients, _attachments;

src/include/msksheet.cpp

@@ -337,9 +337,9 @@ public:
   // @cmember Modifica a video la riga
   void update(int row); 
   // @cmember Ritorna la disabilitazione della colonna <p col>
-  bool column_disabled(int col) const { return _column_disabled[col]; }
+	bool column_disabled(int col) const;
   // @cmember Ritorna l' abilitazione della colonna <p col>
-  bool column_enabled(int col) const { return !column_disabled(col); }
+	bool column_enabled(int col) const;
 
 	// @cmember Ritorna il contenuto della riga <p n>-esima
 	TToken_string& row(int n) { return _str.row(n); }
@@ -1065,6 +1065,21 @@ bool TSpreadsheet::destroy(
   return ok;
 }
 
+bool TSpreadsheet::column_disabled(int col) const
+{
+	if (col >= FIRST_FIELD)
+		col = cid2index(col);
+	return _column_disabled[col];
+}
+
+bool TSpreadsheet::column_enabled(int col) const
+{ 
+	if (col >= FIRST_FIELD)
+		col = cid2index(col);
+	return !column_disabled(col); 
+}
+
+
 // @doc INTERNAL
 
 // @mfunc Modifica a video la riga