diff --git a/cg/cg4400.cpp b/cg/cg4400.cpp index 1da00338d..c0b92de09 100755 --- a/cg/cg4400.cpp +++ b/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) diff --git a/cg/cg4400.h b/cg/cg4400.h index 0d51f60a4..1dd00c111 100755 --- a/cg/cg4400.h +++ b/cg/cg4400.h @@ -13,11 +13,9 @@ #include #include #include -<<<<<<< cg4400.h -#include "conto.h" -======= + #include "conto.h" // CI VOGLIONO LE VIRGOLETTE! CAPITELA! ->>>>>>> 1.25 + #include #include #include diff --git a/cg/cg5300.cpp b/cg/cg5300.cpp index c6575f606..15ef28634 100755 --- a/cg/cg5300.cpp +++ b/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));