diff --git a/cg/cg1100.cpp b/cg/cg1100.cpp
index 0ba2ae7e0..092360c90 100755
--- a/cg/cg1100.cpp
+++ b/cg/cg1100.cpp
@@ -12,6 +12,7 @@
 #include <execp.h>
 
 #include <lffiles.h>
+#include <nditte.h>
 #include <pconti.h>
 #include "cg1.h"
 #include "cg1100.h"
@@ -78,10 +79,10 @@ public:
 void CG1100_application::process_link(int id, const char* txt)
 {
   TString ss = "1|"; ss << txt;
-  TMessage fs(cmd2name("cg0","0"), MSG_LN, ss);
+  TMessage fs(cmd2name("cg0","-0"), MSG_LN, ss);
   TMailbox m;
   m.send(fs);              
-  TExternal_app cg0("cg -0");
+  TExternal_app cg0("cg0 -0");
   if (cg0.run()) beep();
 }
 
@@ -113,6 +114,7 @@ print_action CG1100_application::postprocess_page(int file,int counter)
 
 void CG1100_application::set_page(int file,int counter)
 {
+  intesta (_tipo_stampa);
   switch (_tipo_stampa) 
   {
   case completa:
@@ -284,9 +286,9 @@ void CG1100_application::set_con_IV()
 
   set_row (2, "@18g%40s", (const char *) descr_IV_dir);
 
-  set_row (2, "@60g$[r]%03d$[n].", (const char *) g);
-  set_row (2, "@64g$[r]%03d$[n].", (const char *) c);
-  set_row (2, "@68g$[r]%06d$[n]", (const char *) s);
+  set_row (2, "@60g$[r]%3d$[n].", (const char *) g);
+  set_row (2, "@64g$[r]%3d$[n].", (const char *) c);
+  set_row (2, "@68g$[r]%6d$[n]", (const char *) s);
 
   set_row (2, "@78g%2d", (const char *) c4);
 
@@ -298,9 +300,9 @@ void CG1100_application::set_senza_IV()
 
   reset_row (1);
 
-  set_row (1, "@1g$[r]@pn$[n]", FLD(lnum,PCN_GRUPPO, "@@@.") );
-  set_row (1, "@5g$[r]@pn$[n]", FLD(lnum,PCN_CONTO, "@@@.") );
-  set_row (1, "@9g$[r]@pn$[n]", FLD(lnum, PCN_SOTTOCONTO, "@@@@@@") );
+  set_row (1, "@1g$[r]@n$[n].", FLD(lnum,PCN_GRUPPO) );
+  set_row (1, "@5g$[r]@n$[n].", FLD(lnum,PCN_CONTO) );
+  set_row (1, "@9g$[r]@n$[n]", FLD(lnum, PCN_SOTTOCONTO) );
   
   set_row (1, "@16g@50s", FLD(lnum,PCN_DESCR) );
 
@@ -348,9 +350,9 @@ void CG1100_application::set_con_ana()
 
   set_row (1, "@15g%-10s", (const char *)DescrCodTabAnabil);
 
-  set_row (1, "@61g$[r]%03d$[n].",  g );
-  set_row (1, "$[r]%03d$[n].",      c );
-  set_row (1, "$[r]%06ld$[n]",      s );
+  set_row (1, "@61g$[r]%3d$[n].",  g );
+  set_row (1, "$[r]%3d$[n].",      c );
+  set_row (1, "$[r]%6ld$[n]",      s );
 
   int r=1;
   while ((d = desc_conto.get()) != NULL)
@@ -367,9 +369,9 @@ void CG1100_application::set_senza_ana()
 
   reset_row (1);
 
-  set_row (1, "@1g$[r]@pn$[n]", FLD(lnum,PCN_GRUPPO, "@@@.") );
-  set_row (1, "@5$[r]g@pn$[n]", FLD(lnum,PCN_CONTO, "@@@.") );
-  set_row (1, "@9$[r]g@pn$[n]", FLD(lnum, PCN_SOTTOCONTO, "@@@@@@") );
+  set_row (1, "@1g$[r]@n$[n].", FLD(lnum,PCN_GRUPPO) );
+  set_row (1, "@5$[r]g@n$[n].", FLD(lnum,PCN_CONTO) );
+  set_row (1, "@9$[r]g@n$[n]", FLD(lnum, PCN_SOTTOCONTO) );
   
   set_row (1, "@16g@50s", FLD(lnum,PCN_DESCR) );
 
@@ -393,9 +395,9 @@ void CG1100_application::set_completa()
 
   reset_row (1);
 
-  set_row (1, "@1g$[r]@pn$[n]", FLD(lnum,PCN_GRUPPO, "@@@.") );
-  set_row (1, "@5g$[r]@pn$[n]", FLD(lnum,PCN_CONTO, "@@@.") );
-  set_row (1, "@9g$[r]@pn", FLD(lnum, PCN_SOTTOCONTO, "@@@@@@") );
+  set_row (1, "@1g$[r]@n$[n].", FLD(lnum,PCN_GRUPPO) );
+  set_row (1, "@5g$[r]@n$[n].", FLD(lnum,PCN_CONTO) );
+  set_row (1, "@9g$[r]@n$[n]", FLD(lnum, PCN_SOTTOCONTO) );
   
   set_row (1, "@16g@50s", FLD(lnum,PCN_DESCR) );
 
@@ -479,10 +481,9 @@ bool CG1100_application::set_print(int)
 
   if (tasto == K_ENTER)
   {
-    _tipo_stampa = (stampe)atoi(_msk->get (F_SCELTA_STAMPA));
-    _salto_pag = (bool) (_msk->get (F_SALTO_PAGINA) == "X");
+    _tipo_stampa = (stampe)_msk->get_int(F_SCELTA_STAMPA);
+    _salto_pag = _msk->get_bool (F_SALTO_PAGINA);
 
-    intesta (_tipo_stampa);
     scegli_cur();
     enable_link("Collegamento Piano dei conti : ", 'r');
     return TRUE;
@@ -493,24 +494,25 @@ bool CG1100_application::set_print(int)
 void CG1100_application::intesta (stampe tipo)
 {
   int soh = 1;       // riga d'inizio dell'intestazione
-  TString sep(132);
+  const long firm = get_firm();
 
   reset_header ();
+  TLocalisamfile ditte(LF_NDITTE);
+  ditte.zero();
+  ditte.put(NDT_CODDITTA, firm);
+  ditte.read();
+  if (ditte.bad()) ditte.zero();
 
-  sep << "Ditta : " << get_firm();
-  sep.left_just(132);
+  TString s(132);
+  s = ditte.get(NDT_RAGSOC);
 
-  set_header (soh++, (const char*) sep);
+  set_header (soh++, "Ditta : %ld %s@125gData : @<  Pag. @#", firm, (const char *) s);
 
-  sep = "Studio : ";
-  sep << "Data : @<  Pag. @#";
-  sep.right_just(132 - (10 + 4));
-  sep.overwrite ("PIANO DEI CONTI");
 
-  set_header (soh++, (const char*)sep);
+  set_header (soh++,"@58gPIANO DEI CONTI");
 
-  sep.fill('_');
-  set_header (soh++, (const char *) sep);
+  s.fill('_');
+  set_header (soh++, (const char *) s);
 
   switch (tipo)
   {
@@ -547,9 +549,8 @@ void CG1100_application::intesta (stampe tipo)
     break;
   }
 
-  set_header (soh++,(const char*)sep);
-  sep = "";
-  set_header (soh, (const char *) sep);
+  set_header (soh++,(const char*)s);
+  set_header (soh, "");
 
 }
 
diff --git a/cg/cg1200.cpp b/cg/cg1200.cpp
index a323402a4..dbe6059cf 100755
--- a/cg/cg1200.cpp
+++ b/cg/cg1200.cpp
@@ -5,12 +5,16 @@
 #include <mailbox.h>
 #include <execp.h>
 
+#include <nditte.h>
 #include <clifo.h>
 #include <saldi.h>
 #include <comuni.h>
 #include "cg1200a.h"
 #include "cg1200b.h"
 
+#define COMRF_ALIAS 50 
+#define COMNASC_ALIAS 51 
+
 enum pt { undefined = 0, elenco = 1, rubriche = 2, etichette = 3 };
 enum pw { clienti = 1, fornitori = 2, both = 3 };
 
@@ -23,47 +27,43 @@ class CG1200_App : public TPrintapp
   pt              _pr_type;
   pw              _pr_what;
   TRelation*      _rel;
-  int             _cur_c1, _cur_c2, _cur_f1, _cur_f2;
+  int             _cur_1, _cur_2;
   int             _sort;
   int             _interline;
   bool            _mov_only;
-  TLocalisamfile* _comuni;
   TLocalisamfile* _saldi;
 
   // etichette
   int             _startrow, _rows_et, _cols_et, _startcol;
 
   // variable field slots
-  TString   _piva;
-  TString   _telefono;
-  TString   _name;
+  TString   _piva, _cpercip, _fax, _telex, _name, _telefono, _indir;
+
 
 public:
 
-  virtual bool preprocess_page(int counter);
-  virtual bool preprocess_print(int counter);
-  virtual print_action postprocess_print(int counter);
+  virtual bool preprocess_page(int file, int counter);
+  virtual bool preprocess_print(int file, int counter);
+  virtual print_action postprocess_print(int file, int counter);
   virtual void user_create();
   virtual bool destroy();
   virtual bool set_print(int);
   
-  int ccli() { return _sort == 1 ? _cur_c1 : _cur_c2; }
-  int cfor() { return _sort == 1 ? _cur_f1 : _cur_f2; }
+  int ccur() { return _sort == 1 ? _cur_1 : _cur_2; }
 
-  TRectype& look_com(TString& cod);
   const char* look_tab(const char* tabname, TString& cod, 
                        const char* fld = "S0");
   const char* get_field(int ln, const char* fn)
   { return current_cursor()->curr(ln).get(fn); }
 
-  void set_rows();
+  virtual void set_page (int file, int counter);
   void set_elenco();
   void set_rubriche();
   void set_etichette();
   void process_link(int id, const char* txt);
 
-  CG1200_App() : TPrintapp(), _piva(30), _telefono(50),
-  _name(60)
+  CG1200_App() : TPrintapp(),_piva(18), _cpercip(10), _fax(50), _telex(50),
+  _name(60), _telefono(90), _indir(70)
   { 
     _rel = NULL; _pr_type = undefined; _startrow = 2; _startcol = 3;
     _rows_et = 9; _cols_et = 40;
@@ -80,34 +80,14 @@ public:
 void CG1200_App::process_link(int id, const char* txt)
 {
   TString ss = "1|";
-  switch (_pr_what)
-  {
-  case clienti :
-    ss << "C|"; break;
-  case fornitori :
-    ss << "F|"; break;
-  case both : 
-    default :
-    break;
-  }
   ss << txt;
-  TMessage fs(cmd2name("cg0","1"), MSG_LN, ss);
+  TMessage fs(cmd2name("cg0","-1"), MSG_LN, ss);
   TMailbox m;
   m.send(fs);             
-  TExternal_app cg0("cg -1");
+  TExternal_app cg0("cg0 -1");
   if (cg0.run()) beep();
 }
 
-TRectype& CG1200_App::look_com(TString& cod)
-{
-  _comuni->curr().zero();
-  _comuni->curr().put("COM",cod);
-  _comuni->read();
-  if (_comuni->bad()) 
-    _comuni->curr().zero();
-  return _comuni->curr();
-}
-
 const char* CG1200_App::look_tab(const char* tabname, TString& cod, 
                                  const char* fld)
 {
@@ -119,7 +99,7 @@ const char* CG1200_App::look_tab(const char* tabname, TString& cod,
   return tab.curr().get(fld);
 }
 
-bool CG1200_App::preprocess_page(int counter)
+bool CG1200_App::preprocess_page(int file, int counter)
 {
   if (_mov_only)
   {
@@ -141,21 +121,41 @@ bool CG1200_App::preprocess_page(int counter)
   if (_piva.empty()) _piva = get_field(LF_CLIFO, CLI_PAIV);
   _telefono = get_field(LF_CLIFO, CLI_PTEL); 
   if (!_telefono.empty()) _telefono << "/";
-  _telefono << get_field(LF_CLIFO, CLI_TEL);
+  _telefono << get_field(LF_CLIFO, CLI_TEL) << " ";
+  TString s(get_field(LF_CLIFO, CLI_PTEL2));
+  if (!s.empty()) s << "/";
+  _telefono << s << get_field(LF_CLIFO, CLI_TEL2) << " ";
+  s = get_field(LF_CLIFO, CLI_PTEL3);
+  if (!s.empty()) s << "/";
+  _telefono << s << get_field(LF_CLIFO, CLI_TEL3);
+  _fax = get_field(LF_CLIFO, CLI_PFAX); 
+  if (!_fax.empty()) _fax << "/";
+  _fax << get_field(LF_CLIFO, CLI_FAX);
+  _telex = get_field(LF_CLIFO, CLI_PTELEX); 
+  if (!_telex.empty()) _telex << "/";
+  _telex << get_field(LF_CLIFO, CLI_TELEX);
+  _indir = get_field(LF_CLIFO, CLI_INDCF); 
+
+  if (!_indir.empty()) _indir << " ";
+  _indir << get_field(LF_CLIFO, CLI_CIVCF);
 
   _name = get_field(LF_CLIFO, CLI_RAGSOC);
+  s = get_field(LF_CLIFO, CLI_CODANAGPER);
+  _cpercip = "";
+  if (s.not_empty()) _cpercip << get_field(LF_CLIFO, CLI_TIPOAPER) << " " << s;
 
-  if (strcmp(get_field(LF_CLIFO, CLI_TIPOAPER),"F") == 0)
-  { 
-    TString surname = _name.mid(30,50); surname.trim();
-    _name    = _name.mid(0,30);  _name.trim();
-    _name << " " << surname;
-  }
+  // che minchia e' questo
+  //  if (strcmp(get_field(LF_CLIFO, CLI_TIPOAPER),"F") == 0)
+  //  { 
+  //    TString surname = _name.mid(30,50); surname.trim();
+  //    _name    = _name.mid(0,30);  _name.trim();
+  //    _name << " " << surname;
+  //  }
 
   return TRUE;
 }
 
-print_action CG1200_App::postprocess_print(int counter)
+print_action CG1200_App::postprocess_print(int file, int counter)
 {
   static bool more = FALSE;
   if (_pr_what == both)
@@ -163,13 +163,13 @@ print_action CG1200_App::postprocess_print(int counter)
     if (more)
     { 
       more = FALSE;
-      select_cursor(ccli());
+      select_cursor(ccur());
       return NEXT_PAGE;
     }
     else
     {
       more = TRUE;
-      select_cursor(cfor());
+      select_cursor(ccur());
       return REPEAT_PAGE;
     }
   }
@@ -187,7 +187,7 @@ bool mask_ctrl_handler(TMask_field& mf, KEY k)
 
 // set printrows
 
-void CG1200_App::set_rows()
+void CG1200_App::set_page(int file, int counter)
 {
   switch(_pr_type)
   {
@@ -207,59 +207,69 @@ void CG1200_App::set_rows()
 
 void CG1200_App::set_elenco()
 {
-  reset_print();
   reset_header();
   // intestazione
-  set_header(1, "Ditta /*TBI*/@82gStudio /*TBI*/@102gData @<@125gPag @#");
+  const long firm = get_firm();
+  TLocalisamfile ditte(LF_NDITTE);
+  ditte.zero();
+  ditte.put(NDT_CODDITTA, firm);
+  ditte.read();
+  if (ditte.bad()) ditte.zero();
+  TString s(ditte.get(NDT_RAGSOC));
+  set_header(1, "Ditta %ld %s @102gData @<@125gPag @#", firm, (const char*) s);
   set_header(2, "Elenco %s",(_pr_what == both ? "Clienti+Fornitori" :
                              (_pr_what == clienti ? "Clienti" : "Fornitori")));
   set_header(3, (const char *)(TString(132).fill('-')));
-  set_header(4, "Codice Ragione sociale@55gIndirizzo@91gC.a.p.Localita'"
-             "@117gPr Telefono");
-  set_header(5,"@8gLuogo di nascita@29gData@40gProv. Nazione  "
-             "Partita IVA Codice fiscale@91gConto di costo/ricavo");
-  set_header(6,"@55gCodice per allegato@90gPercipiente 770");
-  set_header(7, (const char *)(TString(132).fill('-')));
+  set_header(4, "  Codice Ragione sociale");
+  set_header(5, "@9gIndirizzo@59gC.A.P.@66gLocalita'");
+  set_header(6, "@9gTelefoni@91gFAX @115gTelex");
+  set_header(7, "@9gLuogo di nascita@46gData"
+             "@56gPartita IVA Codice fiscale@93gConto di costo/ricavo@115gC.allegato@126gPerc.770");
+  set_header(8, (const char *)(TString(132).fill('-')));
   // body
-  set_row(1,"$[r]@pn$[n} #s@55g@s@91g@s @s@117g@s #s",
-          FLD(LF_CLIFO, CLI_CODCF,"@@@@@@"),
-          (const char*)_name,
-          FLD(LF_CLIFO, CLI_INDCF),
-          FLD(LF_CLIFO, CLI_CAPCF),
-          FLD(LF_COMUNI,COM_DENCOM),
-          FLD(LF_COMUNI,COM_PROVCOM),
-          (const char*)_telefono);
-  set_row(2,"@54g#s@90g@2n @2n @pn",
-          (const char *)_piva,
-          FLD(LF_CLIFO,CLI_GRUPPORIC),
-          FLD(LF_CLIFO,CLI_CONTORIC),
-          FLD(LF_CLIFO, CLI_SOTTOCRIC,"@@@@@@"));
+  set_row(1,"$[r]@1s$[n] $[r]@pn$[n] #t", FLD(LF_CLIFO, CLI_TIPOCF),
+          FLD(LF_CLIFO, CLI_CODCF,"@@@@@@"), &_name);
+  set_row(2,"@9g#t@59g@s@66g@s @s", &_indir, FLD(LF_CLIFO, CLI_CAPCF),
+          FLD(-COMRF_ALIAS,COM_DENCOM), FLD(-COMRF_ALIAS,COM_PROVCOM));
+  set_row(3,"@9g#t@90g#t@115g#t", &_telefono, &_fax, &_telex);
+  set_row(4,"@9g@s @s@46g@ld@56g#t@92g@3n @3n @6n@115g@n@126g#t",
+          FLD(-COMNASC_ALIAS, COM_DENCOM), FLD(-COMNASC_ALIAS, COM_PROVCOM),
+          FLD(LF_CLIFO, CLI_DATANASC), &_piva, FLD(LF_CLIFO,CLI_GRUPPORIC),
+          FLD(LF_CLIFO,CLI_CONTORIC), FLD(LF_CLIFO, CLI_SOTTOCRIC),
+          FLD(LF_CLIFO, CLI_CODALLEG), &_cpercip);
   
   for(int i = 0; i < _interline; i++)
-    set_row(i+3,"");
+    set_row(i+5,"");
 }
 
 void CG1200_App::set_rubriche()
 {
-  reset_print();
   reset_header();
   // intestazione
-  set_header(1, "Ditta /*TBI*/@82gStudio /*TBI*/@102gData @<@125gPag @#");
+  const long firm = get_firm();
+  TLocalisamfile ditte(LF_NDITTE);
+  ditte.zero();
+  ditte.put(NDT_CODDITTA, firm);
+  ditte.read();
+  if (ditte.bad()) ditte.zero();
+  TString s(ditte.get(NDT_RAGSOC));
+  set_header(1, "Ditta %ld %s @102gData @<@125gPag @#", firm, (const char*) s);
   set_header(2, "Rubrica %s",(_pr_what == both ? "Clienti+Fornitori" :
                               (_pr_what == clienti ? "Clienti" : "Fornitori")));
   set_header(3, (const char *)(TString(132).fill('-')));
-  set_header(4, "Codice C Ragione sociale@41gIndirizzo@77gCap@83gLocalita'"
-             "@104gPr Partita iva  Telefono");
-  set_header(5, (const char *)(TString(132).fill('-')));
+  set_header(4, "  Codice Ragione sociale");
+  set_header(5, "@9gIndirizzo@59gC.A.P.@66gLocalita'");
+  set_header(6, "@9gTelefoni@91gFAX @115gTelex");
+  set_header(7, (const char *)(TString(132).fill('-')));
   // body
-  set_row(1,"$[r]@pn$[n] #s@55g@s@91g@s @s@117g@s #s",
-          FLD(LF_CLIFO,CLI_CODCF,"@@@@@@"),
-          (const char *)_name,
-          FLD(LF_CLIFO,CLI_INDCF),
-          FLD(LF_CLIFO, CLI_CAPCF),
-          FLD(LF_COMUNI, COM_DENCOM),
-          FLD(LF_COMUNI, COM_PROVCOM),
-          (const char*)_telefono);
+  set_row(1,"$[r]@1s$[n] $[r]@pn$[n] #t", FLD(LF_CLIFO,CLI_TIPOCF),
+          FLD(LF_CLIFO,CLI_CODCF,"@@@@@@"), &_name);
+  set_row(2,"@9g#t@59g@s@66g@s @s", &_indir, FLD(LF_CLIFO, CLI_CAPCF),
+          FLD(-COMRF_ALIAS,COM_DENCOM), FLD(-COMRF_ALIAS,COM_PROVCOM));
+  set_row(3,"@9g#t@90g#t@115g#t", &_telefono, &_fax, &_telex);
+
+  for(int i = 0; i < _interline; i++)
+    set_row(i+4,"");
 }
 
 bool mask2_reset_fields(TMask_field& mf, KEY k)
@@ -277,41 +287,19 @@ bool mask2_reset_fields(TMask_field& mf, KEY k)
 
 void CG1200_App::set_etichette()
 {
-  reset_print();
   reset_header();
-  TMask mask2("cg1200b.msk");
-  
-  /* TBI read/save from - to config file */
-
-  mask2.set_handler(BUT_CGB_RESET,  mask2_reset_fields);
-  
-  mask2.field(FLD_CGB_ROWSET).set(format("%d",_rows_et));
-  mask2.field(FLD_CGB_COLSET).set(format("%d",_cols_et));
-
-  mask2.field(FLD_CGB_STARTROW).set(format("%d",_startrow));
-  mask2.field(FLD_CGB_STARTCOL).set(format("%d",_startcol));
-
-  // set defaults
-
-  mask2.run();
-
-  _startrow  = atoi(mask2.get(FLD_CGB_STARTROW));
-  _startcol  = atoi(mask2.get(FLD_CGB_STARTCOL));
-  _rows_et  = atoi(mask2.get(FLD_CGB_ROWSET));
-  _cols_et  = atoi(mask2.get(FLD_CGB_COLSET));
-
   for (int i = 1; i < _startrow; i++)
     set_row(i,"");
   
-  set_row(_startrow,   format("@%dg#%ds",_startcol, _cols_et - _startcol), 
-          (const char*)_name);
-  set_row(_startrow+1, format("@%dg@%ds",_startcol, _cols_et - _startcol), 
-          FLD(LF_CLIFO, CLI_INDCF));
+  set_row(_startrow,   format("@%dg#-%dt",_startcol, _cols_et - _startcol), 
+          &_name);
+  set_row(_startrow+1, format("@%dg#-%dt",_startcol, _cols_et - _startcol), 
+          &_indir);
   set_row(_startrow+2, format("@%dg@5s @%ds @2s",_startcol, 
                               _cols_et -  _startcol - 9),
           FLD(LF_CLIFO, CLI_CAPCF),
-          FLD(LF_COMUNI, COM_DENCOM),
-          FLD(LF_COMUNI, COM_PROVCOM));
+          FLD(-COMRF_ALIAS, COM_DENCOM),
+          FLD(-COMRF_ALIAS, COM_PROVCOM));
 
   for (i = _startrow+3; i <= _rows_et; i++)
     set_row(i,"");
@@ -319,7 +307,11 @@ void CG1200_App::set_etichette()
 
 bool CG1200_App::set_print(int)
 {
+  disable_links();
+  set_multiple_link(FALSE);
+
   TMask mask("cg1200a.msk");
+
   mask.set_handler(BUT_CG12_ELENCO,    mask_ctrl_handler);
   mask.set_handler(BUT_CG12_RUBRICHE,  mask_ctrl_handler);
   mask.set_handler(BUT_CG12_ETICHETTE, mask_ctrl_handler);
@@ -335,78 +327,87 @@ bool CG1200_App::set_print(int)
     _pr_type = elenco;
     break;
   case BUT_CG12_ETICHETTE:
+  {
+    TMask mask2("cg1200b.msk");
+    
+    /* TBI read/save from - to config file */
     _pr_type = etichette;
+
+    mask2.set_handler(BUT_CGB_RESET,  mask2_reset_fields);
+    
+    mask2.field(FLD_CGB_ROWSET).set(format("%d",_rows_et));
+    mask2.field(FLD_CGB_COLSET).set(format("%d",_cols_et));
+    
+    mask2.field(FLD_CGB_STARTROW).set(format("%d",_startrow));
+    mask2.field(FLD_CGB_STARTCOL).set(format("%d",_startcol));
+
+    // set defaults
+
+    mask2.run();
+
+    _startrow  = atoi(mask2.get(FLD_CGB_STARTROW));
+    _startcol  = atoi(mask2.get(FLD_CGB_STARTCOL));
+    _rows_et  = atoi(mask2.get(FLD_CGB_ROWSET));
+    _cols_et  = atoi(mask2.get(FLD_CGB_COLSET));
     break;
+  }
   case BUT_CG12_RUBRICHE:
     _pr_type = rubriche;
     break;
   }
   
-  _sort      = atoi(mask.get(RDB_CG12_SORT));
-  _pr_what   = (pw)atoi(mask.get(RDB_CG12_TYPE));
-  if (_pr_what != both && _pr_type != rubriche)
+  if (_pr_type != etichette)
+  {
+    set_multiple_link(TRUE);
     enable_link("Collegamento Archivio clienti e fornitori : ", 'r');
-  _interline = atoi(mask.get(LST_CG12_INTERLINE));
-  _mov_only  = mask.get(CHK_CG12_MOVIM) == "X";
+  }
 
-  TString cod_from(5), cod_to(5);
-  TLocalisamfile* fl;
-  
-  if (_pr_what == fornitori) 
-    select_cursor(cfor()); 
-  else select_cursor(ccli());
+  _sort      = mask.get_int(RDB_CG12_SORT);
+  _pr_what   = (pw) mask.get_int(RDB_CG12_TYPE);
+  _interline = mask.get_int(LST_CG12_INTERLINE);
+  _mov_only  = mask.get_bool(CHK_CG12_MOVIM);
+
+  select_cursor(ccur()); 
   
+  TRectype tr1(current_cursor()->curr());
+  tr1.zero();
+  TRectype tr2(tr1);
+
   if (_pr_what != both)
   {
     // filter
+    tr1.put(CLI_TIPOCF, _pr_what == clienti ? "C" : "F");
+    tr2.put(CLI_TIPOCF, _pr_what == clienti ? "C" : "F");
+    short fromid, toid;
+    TString nome_campo(12);
+
     if (_sort == 1)
     {
-      cod_from = mask.get(_pr_what == clienti ? FLD_CLI_CODFR 
-                          : FLD_FOR_CODFR);
-      cod_to   = mask.get(_pr_what == clienti ? FLD_CLI_CODTO 
-                          : FLD_FOR_CODTO);
+      fromid = (_pr_what == clienti) ? FLD_CLI_CODFR : FLD_FOR_CODFR;
+      toid = (_pr_what == clienti) ? FLD_CLI_CODTO : FLD_FOR_CODTO;
+      nome_campo = CLI_CODCF;
     }
     else 
     {
-      cod_from = mask.get(_pr_what == clienti ? FLD_CLI_RAGSOCFR 
-                          : FLD_FOR_RAGSOCFR);
-      cod_to   = mask.get(_pr_what == clienti ? FLD_CLI_RAGSOCTO 
-                          : FLD_FOR_RAGSOCTO);
-    }
-    if ((!cod_from.empty() || !cod_to.empty()) && _pr_what != both)
-    {
-      fl = current_cursor()->file(LF_CLIFO);
-      TRectype tr1(fl->curr());
-      TRectype tr2(fl->curr());
-      tr1.zero(); tr2.zero();
-      if (_sort == 1)
-      {
-        tr1.put(CLI_CODCF,cod_from);
-        tr2.put(CLI_CODCF,cod_to);
-        tr1.put(CLI_TIPOCF, _pr_what == clienti ? "C" : "F");
-        tr2.put(CLI_TIPOCF, _pr_what == clienti ? "C" : "F");
-      }
-      else
-      {
-        tr1.put(CLI_RAGSOC,cod_from);
-        tr2.put(CLI_RAGSOC,cod_to);
-      }
-      current_cursor()->setregion(cod_from.empty() ? NULL : &tr1,
-                                  cod_to.empty()   ? NULL : &tr2);
+      fromid = (_pr_what == clienti) ? FLD_CLI_RAGSOCFR : FLD_FOR_RAGSOCFR;
+      toid = (_pr_what == clienti) ? FLD_CLI_RAGSOCTO : FLD_FOR_RAGSOCTO;
+      nome_campo = CLI_RAGSOC;
     }
+    const TString cod_from(mask.get(fromid));
+    const TString cod_to(mask.get(toid)); 
+
+    if (cod_from.not_empty()) tr1.put(nome_campo, cod_from);
+    if (cod_to.not_empty()) tr2.put(nome_campo, cod_to);
   }
+  current_cursor()->setregion(tr1, tr2);
   
-  // initialize (non dovrebbe servire)
-  (*current_cursor()) = 0l;
-  
-  // set initial print rows & headers
-  set_rows();
   return TRUE;
 }
 
 
-bool CG1200_App::preprocess_print(int counter)
+bool CG1200_App::preprocess_print(int file, int counter)
 {
+  reset_print();
   if (_pr_type == undefined)
     return set_print(counter);
   return TRUE;
@@ -416,13 +417,11 @@ void CG1200_App::user_create()
 {
   // set relation and cursors
   _rel    = new TRelation(LF_CLIFO);   
-  _rel->add(LF_COMUNI, "COM=COMCF");
-  _comuni = _rel->lfile(LF_COMUNI);   
+  _rel->add(LF_COMUNI, "STATO==STATOCF|COM==COMCF", 1, 0, COMRF_ALIAS);
+  _rel->add(LF_COMUNI, "STATO==STATONASC|COM==COMNASC", 1, 0, COMNASC_ALIAS);
   _saldi  = new TLocalisamfile(LF_SALDI); _saldi->setkey(2);   
-  _cur_c1 = add_cursor(new TCursor(_rel,"TIPOCF=\"C\"",1));
-  _cur_c2 = add_cursor(new TCursor(_rel,"TIPOCF=\"C\"",2));
-  _cur_f1 = add_cursor(new TCursor(_rel,"TIPOCF=\"F\"",1));
-  _cur_f2 = add_cursor(new TCursor(_rel,"TIPOCF=\"F\"",2));
+  _cur_1 = add_cursor(new TCursor(_rel,"",1));
+  _cur_2 = add_cursor(new TCursor(_rel,"",2));
   add_file(LF_CLIFO);
   enable_print_menu();
 }
diff --git a/cg/cg1200a.h b/cg/cg1200a.h
index 0507211c0..55306ace9 100755
--- a/cg/cg1200a.h
+++ b/cg/cg1200a.h
@@ -11,7 +11,6 @@
 #define CHK_CG12_MOVIM 111
 #define LST_CG12_INTERLINE 112
 #define CHK_CG12_INCLDI 113
-#define CHK_CG12_PRINTONE 114
 #define BUT_CG12_ELENCO 115
 #define BUT_CG12_RUBRICHE 116
 #define BUT_CG12_ETICHETTE 117
diff --git a/cg/cg1200a.uml b/cg/cg1200a.uml
index 9f8cc0e16..a0f214f89 100755
--- a/cg/cg1200a.uml
+++ b/cg/cg1200a.uml
@@ -1,230 +1,202 @@
-#include "cg1200a.h"
-#include <lffiles.h>
-PAGE "Definizione Stampe" -1 -1 70 17
-
-RADIOBUTTON RDB_CG12_TYPE 22
-BEGIN
-	PROMPT 4 1 "Oggetto"
-	HELP "Selezionare l'archivio che si desidera stampare"
-	ITEM "1|Clienti" 
-	  MESSAGE HIDE,FLD_FOR_RAGSOCFR|HIDE,FLD_FOR_RAGSOCTO
-	  MESSAGE HIDE,FLD_FOR_CODFR|HIDE,FLD_FOR_CODTO
-	  MESSAGE SHOW,FLD_CLI_RAGSOCFR|SHOW,FLD_CLI_RAGSOCTO
-	  MESSAGE SHOW,FLD_CLI_CODFR|SHOW,FLD_CLI_CODTO
-	ITEM "2|Fornitori" 
-	  MESSAGE SHOW,FLD_FOR_RAGSOCFR|SHOW,FLD_FOR_RAGSOCTO
-	  MESSAGE SHOW,FLD_FOR_CODFR|SHOW,FLD_FOR_CODTO
-	  MESSAGE HIDE,FLD_CLI_RAGSOCFR|HIDE,FLD_CLI_RAGSOCTO
-	  MESSAGE HIDE,FLD_CLI_CODFR|HIDE,FLD_CLI_CODTO
-	ITEM "3|Entrambi" 
-	  MESSAGE HIDE,FLD_FOR_RAGSOCFR|HIDE,FLD_FOR_RAGSOCTO
-	  MESSAGE HIDE,FLD_FOR_CODFR|HIDE,FLD_FOR_CODTO
-	  MESSAGE SHOW,FLD_CLI_RAGSOCFR|HIDE,FLD_CLI_RAGSOCTO
-	  MESSAGE SHOW,FLD_CLI_CODFR|SHOW,FLD_CLI_CODTO
-	  MESSAGE DISABLE,FLD_CLI_RAGSOCFR|DISABLE,FLD_CLI_RAGSOCTO
-	  MESSAGE DISABLE,FLD_CLI_CODFR|DISABLE,FLD_CLI_CODTO
-END
-
-RADIOBUTTON RDB_CG12_SORT 22
-BEGIN
-	PROMPT 4 6 "Ordinamento"
-	HELP "Selezionare il tipo di ordinamento dei record stampati"
-	ITEM "1|per Codice"
-	  MESSAGE DISABLE,FLD_FOR_RAGSOCFR|DISABLE,FLD_FOR_RAGSOCTO
-	  MESSAGE DISABLE,FLD_CLI_RAGSOCFR|DISABLE,FLD_CLI_RAGSOCTO
-	  MESSAGE RESET,FLD_FOR_RAGSOCFR|RESET,FLD_FOR_RAGSOCTO
-	  MESSAGE RESET,FLD_CLI_RAGSOCFR|RESET,FLD_CLI_RAGSOCTO
-	  MESSAGE ENABLE,FLD_FOR_CODFR|ENABLE,FLD_FOR_CODTO
-	  MESSAGE ENABLE,FLD_CLI_CODFR|ENABLE,FLD_CLI_CODTO
-	ITEM "2|per Ragione Sociale"
-	  MESSAGE DISABLE,FLD_FOR_CODFR|DISABLE,FLD_FOR_CODTO
-	  MESSAGE DISABLE,FLD_CLI_CODFR|DISABLE,FLD_CLI_CODTO
-	  MESSAGE RESET,FLD_FOR_CODFR|RESET,FLD_FOR_CODTO
-	  MESSAGE RESET,FLD_CLI_CODFR|RESET,FLD_CLI_CODTO
-	  MESSAGE ENABLE,FLD_FOR_RAGSOCFR|ENABLE,FLD_FOR_RAGSOCTO
-	  MESSAGE ENABLE,FLD_CLI_RAGSOCFR|ENABLE,FLD_CLI_RAGSOCTO
-END
-
-GROUPBOX DLG_NULL 47 3
-BEGIN
-	PROMPT 2 13 "Stampa"
-END
-
-GROUPBOX DLG_NULL 35 10
-BEGIN
-	PROMPT 32 1 "Selezione "
-END
-
-TEXT DLG_NULL
-BEGIN
-	PROMPT 34 5 "da Ragione Sociale/Nominativo"
-END
-TEXT DLG_NULL
-BEGIN
-	PROMPT 34 7 "a Ragione Sociale/Nominativo"
-END
-TEXT DLG_NULL
-BEGIN
-	PROMPT 34 2 "da Codice"
-END
-TEXT DLG_NULL
-BEGIN
-	PROMPT 48 2 "a Codice"
-END
-
-STRING FLD_CLI_CODFR 5
-BEGIN
-	PROMPT 34 3 ""
-	USE LF_CLIFO KEY 1
-	INPUT TIPOCF "C"
-	INPUT CODCF FLD_CLI_CODFR
-	DISPLAY "Codice" CODCF
-	DISPLAY "Codice Fiscale     " COFI
-	DISPLAY "Ragione sociale                          " RAGSOC
-	OUTPUT FLD_CLI_RAGSOCFR RAGSOC 
-	OUTPUT FLD_CLI_CODFR CODCF 
-	HELP "Introdurre codice di inizio stampa: vuoto = inizio archivio"
-END
-
-STRING FLD_CLI_CODTO 5
-BEGIN
-	PROMPT 48 3 ""
-	COPY USE FLD_CLI_CODFR
-	INPUT TIPOCF "C"
-	INPUT CODCF FLD_CLI_CODTO
-	DISPLAY "Codice" CODCF
-	DISPLAY "Codice Fiscale     " COFI
-	DISPLAY "Ragione sociale                          " RAGSOC
-	OUTPUT FLD_CLI_RAGSOCTO RAGSOC 
-	OUTPUT FLD_CLI_CODTO CODCF
-	HELP "Introdurre codice di fine stampa: vuoto = fine archivio"
-END
-
-STRING FLD_CLI_RAGSOCFR 29
-BEGIN
-	PROMPT 34 6 ""
-	USE LF_CLIFO KEY 2 SELECT TIPOCF="C"
-	INPUT RAGSOC FLD_CLI_RAGSOCFR
-	DISPLAY "Codice" CODCF
-	DISPLAY "Codice Fiscale     " COFI
-	DISPLAY "Ragione sociale                          " RAGSOC
-	OUTPUT FLD_CLI_CODFR CODCF 
-	OUTPUT FLD_CLI_RAGSOCFR RAGSOC
-	HELP "Introdurre rag. soc. di inizio stampa: vuoto = inizio archivio"
-END
-
-STRING FLD_CLI_RAGSOCTO 29
-BEGIN
-	PROMPT 34 8 ""
-	COPY USE FLD_CLI_RAGSOCFR
-	INPUT RAGSOC FLD_CLI_RAGSOCTO
-	DISPLAY "Codice" CODCF
-	DISPLAY "Codice Fiscale     " COFI
-	DISPLAY "Ragione sociale                          " RAGSOC
-	OUTPUT FLD_CLI_CODTO CODCF 
-	OUTPUT FLD_CLI_RAGSOCTO RAGSOC 
-	HELP "Introdurre ragione soc. di fine stampa: vuoto = fine archivio"
-END
-
-STRING FLD_FOR_CODFR 5
-BEGIN
-	PROMPT 34 3 ""
-	FLAGS "H"
-	COPY USE FLD_CLI_CODFR
-	INPUT TIPOCF "F"
-	INPUT CODCF FLD_FOR_CODFR
-	DISPLAY "Codice" CODCF
-	DISPLAY "Codice Fiscale     " COFI
-	DISPLAY "Ragione sociale                          " RAGSOC
-	OUTPUT FLD_FOR_RAGSOCFR RAGSOC 
-	OUTPUT FLD_FOR_CODFR CODCF
-	HELP "Introdurre codice di inizio stampa: vuoto = inizio archivio"
-END
-
-STRING FLD_FOR_CODTO 5
-BEGIN
-	PROMPT 48 3 ""
-	FLAGS "H"
-	COPY USE FLD_FOR_CODFR
-	INPUT TIPOCF "F"
-	INPUT CODCF FLD_FOR_CODTO
-	DISPLAY "Codice" CODCF
-	DISPLAY "Codice Fiscale     " COFI
-	DISPLAY "Ragione sociale                          " RAGSOC
-	OUTPUT FLD_FOR_RAGSOCTO RAGSOC
-	OUTPUT FLD_FOR_CODTO CODCF
-	HELP "Introdurre codice di fine stampa: vuoto = fine archivio"
-END
-
-STRING FLD_FOR_RAGSOCFR 29
-BEGIN
-	PROMPT 34 6 ""
-	FLAGS "H"
-	USE LF_CLIFO KEY 2 SELECT TIPOCF="F"
-	INPUT RAGSOC FLD_FOR_RAGSOCFR
-	DISPLAY "Codice" CODCF
-	DISPLAY "Codice Fiscale     " COFI
-	DISPLAY "Ragione sociale                          " RAGSOC
-	OUTPUT FLD_FOR_CODFR CODCF 
-	OUTPUT FLD_FOR_RAGSOCFR RAGSOC
-	HELP "Introdurre rag. soc. di inizio stampa: vuoto = inizio archivio"
-END
-
-STRING FLD_FOR_RAGSOCTO 29
-BEGIN
-	PROMPT 34 8 ""
-	FLAGS "H"
-	COPY USE FLD_FOR_RAGSOCFR
-	INPUT RAGSOC FLD_FOR_RAGSOCTO
-	DISPLAY "Codice" CODCF
-	DISPLAY "Codice Fiscale     " COFI
-	DISPLAY "Ragione sociale                          " RAGSOC
-	OUTPUT FLD_FOR_CODTO CODCF 
-	OUTPUT FLD_FOR_RAGSOCTO RAGSOC 
-	HELP "Introdurre ragione soc. di fine stampa: vuoto = fine archivio"
-END
-
-BOOLEAN CHK_CG12_MOVIM
-BEGIN
-	PROMPT 4 10 "Solo movimentati"
-	HELP "Selezionare per stampare solo inclusi archivio movimenti"
-END
-
-
-BOOLEAN CHK_CG12_PRINTONE
-BEGIN
-	PROMPT 4 11 "Stampa un solo record"
-	HELP "Selezionare per stampare soltanto il record nel campo DA"
-END
-
-LIST LST_CG12_INTERLINE 1
-BEGIN
-	PROMPT 34 11 "N. righe interlinea "
-	ITEM "0|0"
-	ITEM "1|1"
-	ITEM "2|2"
-	HELP "Scegliere il numero di righe di interlinea tra i nominativi"
-END
-
-BUTTON BUT_CG12_ELENCO 9 2
-BEGIN
-	PROMPT 4 14 "Elenco"
-END
-
-BUTTON BUT_CG12_RUBRICHE 9 2
-BEGIN
-	PROMPT 19 14 "Rubriche"
-END
-
-BUTTON BUT_CG12_ETICHETTE 9 2
-BEGIN
-	PROMPT 35 14 "Etichette"
-END
-
-BUTTON DLG_CANCEL 9 2
-BEGIN
-	PROMPT 53 14 "Annulla"
-END
-
-ENDPAGE
-ENDMASK
+#include "cg1200a.h"
+#include <lffiles.h>
+PAGE "Selezione" -1 -1 70 17
+
+RADIOBUTTON RDB_CG12_TYPE 22
+BEGIN
+	PROMPT 4 1 "Oggetto"
+	HELP "Selezionare l'archivio che si desidera stampare"
+	ITEM "1|Clienti" 
+	  MESSAGE HIDE,2@|SHOW,1@|RESET,2@
+	ITEM "2|Fornitori" 
+	  MESSAGE HIDE,1@|SHOW,2@|RESET,1@
+	ITEM "3|Entrambi" 
+	  MESSAGE HIDE,1@|HIDE,2@|RESET,1@|RESET,2@
+END
+
+RADIOBUTTON RDB_CG12_SORT 22
+BEGIN
+	PROMPT 4 6 "Ordinamento"
+	HELP "Selezionare il tipo di ordinamento dei record stampati"
+	ITEM "1|per Codice"
+	  MESSAGE DISABLE,4@|ENABLE,3@|RESET,4@
+	ITEM "2|per Ragione Sociale"
+	  MESSAGE DISABLE,3@|ENABLE,4@|RESET,3@
+END
+
+GROUPBOX DLG_NULL 35 10
+BEGIN
+	PROMPT 32 1 "Selezione "
+END
+
+TEXT DLG_NULL
+BEGIN
+	PROMPT 34 5 "da Ragione Sociale/Nominativo"
+END
+
+TEXT DLG_NULL
+BEGIN
+	PROMPT 34 7 "a Ragione Sociale/Nominativo"
+END
+
+TEXT DLG_NULL
+BEGIN
+	PROMPT 34 2 "da Codice"
+END
+
+TEXT DLG_NULL
+BEGIN
+	PROMPT 48 2 "a Codice"
+END
+
+STRING FLD_CLI_CODFR 5
+BEGIN
+	PROMPT 34 3 ""
+	USE LF_CLIFO KEY 1
+	INPUT TIPOCF "C"
+	INPUT CODCF FLD_CLI_CODFR
+	DISPLAY "Codice" CODCF
+	DISPLAY "Codice Fiscale@16" COFI
+	DISPLAY "Ragione sociale@50" RAGSOC
+	OUTPUT FLD_CLI_CODFR CODCF 
+ 	GROUP 1 3
+	HELP "Introdurre codice di inizio stampa: vuoto = inizio archivio"
+END
+
+STRING FLD_CLI_CODTO 5
+BEGIN
+	PROMPT 48 3 ""
+	COPY USE FLD_CLI_CODFR
+	INPUT TIPOCF "C"
+	INPUT CODCF FLD_CLI_CODTO
+	COPY DISPLAY FLD_CLI_CODFR
+	OUTPUT FLD_CLI_CODTO CODCF
+ 	GROUP 1 3
+	HELP "Introdurre codice di fine stampa: vuoto = fine archivio"
+	NUM_EXPR {(#THIS_FIELD == 0) || (#THIS_FIELD >= #FLD_CLI_CODFR)} 
+	WARNING "Limite superiore errato"
+END
+
+STRING FLD_CLI_RAGSOCFR 50 29
+BEGIN
+	PROMPT 34 6 ""
+	USE LF_CLIFO KEY 2
+	INPUT TIPOCF "C"
+	INPUT RAGSOC FLD_CLI_RAGSOCFR
+	DISPLAY "Ragione sociale@50" RAGSOC
+	DISPLAY "Codice" CODCF
+	DISPLAY "Codice Fiscale@16" COFI
+	OUTPUT FLD_CLI_RAGSOCFR RAGSOC
+ 	GROUP 1 4
+	HELP "Introdurre rag. soc. di inizio stampa: vuoto = inizio archivio"
+END
+
+STRING FLD_CLI_RAGSOCTO 50 29
+BEGIN
+	PROMPT 34 8 ""
+	COPY USE FLD_CLI_RAGSOCFR
+	INPUT RAGSOC FLD_CLI_RAGSOCTO
+	COPY DISPLAY FLD_CLI_RAGSOCFR
+	OUTPUT FLD_CLI_RAGSOCTO RAGSOC 
+ 	GROUP 1 4
+	HELP "Introdurre ragione soc. di fine stampa: vuoto = fine archivio"
+	STR_EXPR {(#THIS_FIELD == "") || (#THIS_FIELD >= #FLD_CLI_RAGSOCFR)} 
+	WARNING "Limite superiore errato"
+END
+
+STRING FLD_FOR_CODFR 5
+BEGIN
+	PROMPT 34 3 ""
+	COPY USE FLD_CLI_CODFR
+	INPUT TIPOCF "F"
+	INPUT CODCF FLD_FOR_CODFR
+	COPY DISPLAY FLD_CLI_CODFR
+	OUTPUT FLD_FOR_CODFR CODCF
+	GROUP 2 3
+	HELP "Introdurre codice di inizio stampa: vuoto = inizio archivio"
+END
+
+STRING FLD_FOR_CODTO 5
+BEGIN
+	PROMPT 48 3 ""
+	COPY USE FLD_FOR_CODFR
+	INPUT TIPOCF "F"
+	INPUT CODCF FLD_FOR_CODTO
+	COPY DISPLAY FLD_CLI_CODFR
+	OUTPUT FLD_FOR_CODTO CODCF
+	GROUP 2 3
+	HELP "Introdurre codice di fine stampa: vuoto = fine archivio"
+	NUM_EXPR {(#THIS_FIELD == 0) || (#THIS_FIELD >= #FLD_FOR_CODFR)} 
+	WARNING "Limite superiore errato"
+END
+
+STRING FLD_FOR_RAGSOCFR 50 29
+BEGIN
+	PROMPT 34 6 ""
+	USE LF_CLIFO KEY 2 
+	INPUT TIPOCF "F"
+	INPUT RAGSOC FLD_FOR_RAGSOCFR
+	COPY DISPLAY FLD_CLI_RAGSOCFR
+	OUTPUT FLD_FOR_RAGSOCFR RAGSOC
+	GROUP 2 4
+	HELP "Introdurre rag. soc. di inizio stampa: vuoto = inizio archivio"
+END
+
+STRING FLD_FOR_RAGSOCTO 50 29
+BEGIN
+	PROMPT 34 8 ""
+	COPY USE FLD_FOR_RAGSOCFR
+	INPUT RAGSOC FLD_FOR_RAGSOCTO
+	COPY DISPLAY FLD_CLI_RAGSOCFR
+	OUTPUT FLD_FOR_RAGSOCTO RAGSOC 
+	GROUP 2 4
+	HELP "Introdurre ragione soc. di fine stampa: vuoto = fine archivio"
+	STR_EXPR {(#THIS_FIELD == "") || (#THIS_FIELD >= #FLD_FOR_RAGSOCFR)} 
+	WARNING "Limite superiore errato"
+END
+
+BOOLEAN CHK_CG12_MOVIM
+BEGIN
+	PROMPT 4 10 "Solo movimentati"
+	HELP "Selezionare per stampare solo inclusi archivio movimenti"
+END
+
+LIST LST_CG12_INTERLINE 1
+BEGIN
+	PROMPT 4 11 "Righe interlinea "
+	ITEM "0|0"
+	ITEM "1|1"
+	ITEM "2|2"
+	HELP "Scegliere il numero di righe di interlinea tra i nominativi"
+END
+
+GROUPBOX DLG_NULL 47 4
+BEGIN
+	PROMPT 2 13 "Stampa"
+END
+
+BUTTON BUT_CG12_ELENCO 9 2
+BEGIN
+	PROMPT 4 14 "~Elenco"
+        MESSAGE EXIT,BUT_CG12_ELENCO
+END
+
+BUTTON BUT_CG12_RUBRICHE 9 2
+BEGIN
+	PROMPT 19 14 "~Rubriche"
+        MESSAGE EXIT,BUT_CG12_RUBRICHE
+END
+
+BUTTON BUT_CG12_ETICHETTE 9 2
+BEGIN
+	PROMPT 35 14 "E~tichette"
+        MESSAGE EXIT,BUT_CG12_ETICHETTE
+END
+
+BUTTON DLG_QUIT 9 2
+BEGIN
+	PROMPT 53 14 ""
+END
+
+ENDPAGE
+ENDMASK
diff --git a/cg/cg1200b.uml b/cg/cg1200b.uml
index 3c744c9b9..e6466d441 100755
--- a/cg/cg1200b.uml
+++ b/cg/cg1200b.uml
@@ -1,63 +1,47 @@
 #include "cg1200b.h"
-PAGE "Impostazione etichette" -1 -1 43 10
-
-TEXT DLG_NULL
-BEGIN
-	PROMPT 2 1 "Riga di inizio in etichetta"
-END
-
-TEXT DLG_NULL
-BEGIN
-	PROMPT 2 3 "Colonna di inizio in etichetta"
-END
-
-TEXT DLG_NULL
-BEGIN
-	PROMPT 2 5 "N. totale di righe etichetta"
-END
-
-TEXT DLG_NULL
-BEGIN
-	PROMPT 2 9 "N. totale colonne etichetta"
-END
+PAGE "Impostazione etichette" -1 -1 45 12
 
 NUMBER FLD_CGB_STARTROW 4
 BEGIN
-	PROMPT 35 1 ""
+	PROMPT 2 1 "Riga di inizio in etichetta      "
+	FLAGS "R"
 	HELP "Immettere la prima riga da stampare nell'etichetta"
 END
 
 NUMBER FLD_CGB_STARTCOL 4
 BEGIN
-	PROMPT 35 3 ""
+	PROMPT 2 3 "Colonna di inizio in etichetta   "
+	FLAGS "R"
 	HELP "Immettere il margine sinistro desiderato"
 END
 
 NUMBER FLD_CGB_ROWSET 4
 BEGIN
-	PROMPT 35 5 ""
+	PROMPT 2 5 "N. totale di righe etichetta     "
+	FLAGS "R"
 	HELP "Immettere il numero totale di righe per etichetta"
 END
 
 NUMBER FLD_CGB_COLSET 4
 BEGIN
-	PROMPT 35 7 ""
+	PROMPT 2 7 "N. totale colonne etichetta      "
+	FLAGS "R"
 	HELP "Immettere il numero totale di colonne per etichetta"
 END
 
-BUTTON DLG_OK 10
+BUTTON DLG_OK 9 2
 BEGIN
-	PROMPT 21 9 "Conferma"
+	PROMPT -13 -1 "Conferma"
 END
 
-BUTTON DLG_CANCEL 9
+BUTTON BUT_CGB_RESET 9 2
 BEGIN
-	PROMPT 32 9 "Annulla"
+	PROMPT -23 -1 "~Reset"
 END
 
-BUTTON BUT_CGB_RESET 7
+BUTTON DLG_CANCEL 9 2
 BEGIN
-	PROMPT 2 9 "Reset"
+	PROMPT -33 -1 "Annulla"
 END
 
 ENDPAGE
diff --git a/cg/makefile b/cg/makefile
index c975b4ec5..88c91871d 100755
--- a/cg/makefile
+++ b/cg/makefile
@@ -50,17 +50,17 @@ $(EP)cg0500a.msk : cg0500a.uml
 
 $(O)/cg1.o:     cg1.cpp $(I10) $(I24) $(I32)
 
-$(O)/cg1100.o:   cg1100.cpp $(I6) $(I10) $(I24) $(I27) $(I33) $(I47) $(I48) cg1100.h $(IP)pconti.h
+$(O)/cg1100.o:   cg1100.cpp $(I31) $(I33) $(I39) $(I41) $(I42) $(I47) $(I48) $(I50) cg1100.h $(IP)pconti.h $(IP)nditte.h
 
-$(O)/cg1200.o:   cg1200.cpp $(I6) $(I10) $(I24) $(I27) $(I33) $(I47) $(I48) cg1200a.h $(IP)saldi.h $(IP)clifo.h $(IP)comuni.h
+$(O)/cg1200.o:   cg1200.cpp $(I6) $(I10) $(I24) $(I27) $(I33) $(I47) $(I48) cg1200a.h $(IP)saldi.h $(IP)clifo.h $(IP)comuni.h $(IP)nditte.h
 
-$(O)/cg1300.o:   cg1200.cpp $(I24) $(I31) $(I33) $(I51)
+$(O)/cg1300.o:   cg1300.cpp $(I24) $(I31) $(I33) $(I51)
 
-$(O)/cg1400.o:   cg1200.cpp $(I24) $(I31) $(I33) $(I40) $(I42) $(I51) $(I39) cg1400.h
+$(O)/cg1400.o:   cg1400.cpp $(I24) $(I31) $(I33) $(I40) $(I42) $(I51) $(I39) cg1400.h
 
 $(O)/cg1500.o:   cg1500.cpp $(I24) $(I31) $(I33) $(I40) $(I42) $(I51) cg1500.h
 
-$(O)/cglib01.o:   cglib01.cpp $(I24) $(I31) $(I33) $(I40) $(I42) $(I51) cglib.h
+$(O)/cglib01.o:  cglib01.cpp $(I24) $(I31) $(I33) $(I40) $(I42) $(I51) cglib.h
 
 $(O)/conto.o:    conto.cpp conto.h $(I15) $(I30) $(I31)
 
diff --git a/include/clifo.h b/include/clifo.h
index 94bfc8a59..2875028de 100755
--- a/include/clifo.h
+++ b/include/clifo.h
@@ -25,6 +25,10 @@
 #define CLI_CODANAGPER  "CODANAGPER" 
 #define CLI_PTEL  "PTEL" 
 #define CLI_TEL  "TEL" 
+#define CLI_PTEL2  "PTEL2" 
+#define CLI_TEL2  "TEL2" 
+#define CLI_PTEL3  "PTEL3" 
+#define CLI_TEL3  "TEL3" 
 #define CLI_PFAX  "PFAX" 
 #define CLI_FAX  "FAX" 
 #define CLI_PTELEX  "PTELEX"