Corretti conflitti e TMP stringa globale

git-svn-id: svn://10.65.10.50/trunk@930 c028cbd2-c16b-5b4b-a496-9718f37d4682

cg/cg4400.cpp

@@ -5,8 +5,6 @@
 #include "cg4400a.h"
 #include "cg4400b.h"
 
-static TString256 TMP;
-
 inline CG4400_application& app() { return (CG4400_application&)main_app(); }
 
 bool CG4400_application::filter_func (const TRelation * r)

cg/cg4400.h

@@ -13,11 +13,9 @@
 #include <sheet.h>
 #include <config.h> 
 #include <prefix.h>
-<<<<<<< cg4400.h
-#include "conto.h"
-=======
+
 #include "conto.h"   // CI VOGLIONO LE VIRGOLETTE! CAPITELA!
->>>>>>> 1.25
+
 #include <nditte.h>
 #include <anagr.h>
 #include <comuni.h>

cg/cg5300.cpp

@@ -308,7 +308,7 @@ int   CG5300_App::read(TMask& m)
   // legge da LIA (si istanziano i campi credito prec. e Freq. Vers
   // prende le attivita' una per una da _atts e 
   // crea le righe sheet
-  m.autoload(); 
+  m.autoload(get_relation()); 
   TSheet_field& sf = (TSheet_field&)m.field(F_SHEET_PLA);
   TToken_string tt(60);
   const TString16 year(m.get(F_YEAR));