diff --git a/ba/ba0100a.h b/ba/ba0100a.h
index a6bdf797e..42fbd495f 100755
--- a/ba/ba0100a.h
+++ b/ba/ba0100a.h
@@ -1,4 +1,4 @@
-#define F_USER  101
+#define F_USER          101
 #define F_PASSWORD      102
 #define F_USERDESC      103
 #define F_BASE  200
@@ -13,13 +13,13 @@
 #define F_MI    209
 #define F_GR    210
 #define F_CE    211
-#define F_AB    212
+#define F_AD    212
 #define F_SC    213
 #define F_MU    214
 #define F_CA    215
 #define F_73    216
 #define F_IN    218
-#define F_AD    220
+#define F_AB    220
 #define F_NI    221
 #define F_NR    222
 #define F_PC    223
diff --git a/ba/ba1100.cpp b/ba/ba1100.cpp
index 1e0a38d61..9cea62ff9 100755
--- a/ba/ba1100.cpp
+++ b/ba/ba1100.cpp
@@ -4,7 +4,8 @@
 #include <utility.h>
 #include <prefix.h>
 #include <isam.h>
-#include <msksheet.h>
+#include <mask.h>
+#include <progind.h>
 #include <urldefid.h>
 #include <validate.h>
 #include <xvtility.h>
@@ -348,9 +349,17 @@ void BA1100_application::update_dir()
 
   d.get(LF_DIR);                 
   const int items = (int)d.eod();
+  TString80 s("Aggiornamento direttorio ");
 
+  if (pref == "com") s << "comune";
+  else s << " della ditta " <<atol (pref);
+  
+  TProgind p(items ? items : 1, s, TRUE, TRUE, 70);
+
+  p.setstatus(1);
   for (int i = 2; i <= items; i++)
-  {              
+  { 
+    p.addstatus(1);
     prefhndl->set(""); 
     d.get(i, _nolock, _nordir, _sysdirop);                 
     TString desc(d.des());
@@ -413,9 +422,18 @@ void BA1100_application::convert_dir()
   
   d.get(LF_DIR);                 
   const int items = (int)d.eod();
+  TString80 s("Aggiornamento archivi ");
+
+  if (pref == "com") s << "comune";
+  else s << " della ditta " << atol (pref);
+  
+  TProgind p(items ? items : 1, s, TRUE, TRUE, 70);
+
+  p.setstatus(1);
   
   for (int i = 2; i <= items; i++)
   {  
+    p.addstatus(1);
     prefhndl->set(""); 
     r.get(i);                 
     prefhndl->set(pref); 
diff --git a/ba/ba1100d.uml b/ba/ba1100d.uml
index 36a12b8a0..2053fa442 100755
--- a/ba/ba1100d.uml
+++ b/ba/ba1100d.uml
@@ -57,7 +57,6 @@ BEGIN
   ITEM "Decimali"
 END
 
-
 SPREADSHEET F_KEYS
 BEGIN
   PROMPT 1 13 ""
diff --git a/ba/ba1101.cpp b/ba/ba1101.cpp
index 63bb34757..83194d6c7 100755
--- a/ba/ba1101.cpp
+++ b/ba/ba1101.cpp
@@ -9,6 +9,7 @@
 #include <expr.h>
 #include <isam.h>
 #include <mask.h>
+#include <progind.h>
 #include <sheet.h>
 #include <msksheet.h>
 #include <urldefid.h>
diff --git a/ba/ba1400a.uml b/ba/ba1400a.uml
index 1390af1b6..a3e7a79d0 100755
--- a/ba/ba1400a.uml
+++ b/ba/ba1400a.uml
@@ -117,9 +117,9 @@ BEGIN
   FLAGS "D"
 END
 
-BOOLEAN F_AB 
+BOOLEAN F_AD 
 BEGIN
-  PROMPT 1 9 "Analisi di Bilancio"
+  PROMPT 1 9 "Anagrafici dichar."
   FIELD AUTSTR[13,13]
 END
 
@@ -170,9 +170,9 @@ BEGIN
   FLAGS "D"
 END
 
-BOOLEAN F_AD
+BOOLEAN F_AB
 BEGIN
-  PROMPT 59 11 "Anagr.Dichiar."
+  PROMPT 59 11 "Analisi bil."
   FIELD AUTSTR[21,21]
   FLAGS "D"
 END
diff --git a/ba/ba1500a.uml b/ba/ba1500a.uml
index 89a3537c8..ef6d68d92 100755
--- a/ba/ba1500a.uml
+++ b/ba/ba1500a.uml
@@ -123,9 +123,9 @@ BEGIN
   FLAGS "D"
 END
 
-BOOLEAN F_AB 
+BOOLEAN F_AD 
 BEGIN
-  PROMPT 1 9 "Analisi di Bilancio"
+  PROMPT 1 9 "Anagrafici dichar."
 END
 
 BOOLEAN F_SC
@@ -168,9 +168,9 @@ BEGIN
   FLAGS "D"
 END
 
-BOOLEAN F_AD
+BOOLEAN F_AB
 BEGIN
-  PROMPT 59 11 "Anagr.Dichiar."
+  PROMPT 59 11 "Analisi bil."
   FLAGS "D"
 END
 
diff --git a/ba/ba3700.cpp b/ba/ba3700.cpp
index 14ed26931..7f6967571 100755
--- a/ba/ba3700.cpp
+++ b/ba/ba3700.cpp
@@ -55,7 +55,7 @@ protected:
 public:
   
   void   set_app_data(void* v) { _app_data = v;    }                
-  static void* get_app_data()  { return ((BA3700_application*)MainApp())->_app_data; }
+  static void* get_app_data()  { return ((BA3700_application &)main_app())._app_data; }
   
   BA3700_application() : TRelation_application() {} 
   virtual ~BA3700_application() {}
diff --git a/ba/ba3700a.uml b/ba/ba3700a.uml
index b17f5de95..c082cc27d 100755
--- a/ba/ba3700a.uml
+++ b/ba/ba3700a.uml
@@ -15,8 +15,9 @@ END
 
 STRING F_CODICE 4
 BEGIN
-  PROMPT 6 1 "Codice          "
+  PROMPT 6 1 "Codice         "
   HELP "Codice condizione di pagamento"
+  FLAGS "U"
   FIELD %CPG->CODTAB
   USE %CPG KEY 1 ALIAS 50
   INPUT CODTAB F_CODICE
@@ -30,9 +31,16 @@ END
 
 STRING F_DESC 50
 BEGIN
-  PROMPT 6 2 "Descrizione     "
+  PROMPT 6 2 "Descrizione    "
   HELP "Descrizione condizione di pagamento"
   FIELD %CPG->S0
+  USE %CPG KEY 2 ALIAS 51
+  INPUT S0 F_DESC
+  DISPLAY "Codice" CODTAB
+  DISPLAY "Descrizione@50" S0
+  COPY OUTPUT F_CODICE
+  CHECKTYPE REQUIRED
+  KEY 2
 END 
 
 GROUPBOX DLG_NULL 71 5
@@ -43,7 +51,7 @@ END
 STRING F_INIZIOSCAD 1
 BEGIN
   PROMPT 6 5 "Part.iniz. calcolo "
-  HELP "Modalit… di inizio conteggio calcolo scadenza"
+  HELP "Modalita' di inizio conteggio calcolo scadenza"
   FIELD %CPG->S1
   SHEET "Cod|Descrizione@30"
   INPUT F_INIZIOSCAD
@@ -51,6 +59,8 @@ BEGIN
   ITEM "F|Data fattura"
   ITEM "M|Fine mese"
   ITEM "I|Da impostare"
+  WARNING "La partenza del calcolo deve essere specificata" 
+  FLAGS "U" 
 END 
 
 BOOLEAN F_MESECOMM
@@ -85,19 +95,20 @@ BEGIN
   ITEM  "2|Uguali"
   ITEM  "3|Uguali dall'ultima modificata"
   ITEM  "4|Uguali finche' possibile"
-/*  FIELD %CPG->B1    */
 END
 
 NUMBER F_NUM_RATE 3
 BEGIN
   PROMPT 6 7 "Numero di rate     "
   HELP "Numero delle rate"
+  FLAGS "R"
 END
 
 NUMBER F_INT_RATE 4
 BEGIN
   PROMPT 35 7 "Intervallo tra rate successive "
   HELP "Giorni di intervallo tra una data e l'altra"
+  FLAGS "R"
 END
 
 SPREADSHEET F_SHEET_RPG 70 9
@@ -106,7 +117,7 @@ BEGIN
   ITEM "N.ro giorni rata"
   ITEM "Percentuale"
   ITEM "Tipo" 
-  ITEM "Pagamento@12"
+  ITEM "Pagamento@28"
   ITEM "Ult.class."
 END
 
@@ -120,60 +131,55 @@ NUMBER 101 4
 BEGIN
   PROMPT 4 1 "Numero giorni             "
   HELP "Numero di giorni per la scadenza"
-/*  FIELD %RPG->I0          */
+  FLAGS "R"
 END
 
-NUMBER 102 8 2
+NUMBER 102 6 2
 BEGIN
   PROMPT 4 3 "Percentuale               "
   HELP "Percentuale della rata"
-/*  FIELD %RPG->R0 */
+  FLAGS "R"
 END
 
 
-NUMBER 103 2 0
+NUMBER 103 1
 BEGIN
-	PROMPT 4 4  "Tipo pagamento "
-	HELP "Tipo di pagamento per la rata"
-	SHEET "Codice|Tipo pagamento@32"
-	INPUT 103
-	OUTPUT 103  
-	OUTPUT 104
-	ITEM "1|Rimessa diretta o contanti"
-	ITEM "2|Tratta"
-	ITEM "3|Ricevuta Bancaria"
-	ITEM "4|Cessione"
-	ITEM "5|Paghero'"
-	ITEM "6|Lettera di credito"
-	ITEM "7|Tratta accettata"
-	ITEM "8|Altro pagamento"
+  PROMPT 4 5 "Tipo pagamento            "
+  HELP "Tipo di pagamento per la rata"
+  SHEET "Codice|Tipo pagamento@32"
+  INPUT 103
+  OUTPUT 103  
+  OUTPUT 104
+  ITEM "1|Rimessa diretta o contanti"
+  ITEM "2|Tratta"
+  ITEM "3|Ricevuta Bancaria"
+  ITEM "4|Cessione"
+  ITEM "5|Paghero'"
+  ITEM "6|Lettera di credito"
+  ITEM "7|Tratta accettata"
+  ITEM "8|Altro pagamento"
 END                                                
 
-
-
-STRING 104 18
+STRING 104 28
 BEGIN
-  PROMPT 4 5 "Pagamento "
+  PROMPT 4 7 "Pagamento                 "
   FLAGS "D"
 END
 
 STRING 105 1
 BEGIN
-  PROMPT 4 6 "Ulteriore class. "
-/*  FIELD %RPG->S1 */
+  PROMPT 4 9 "Ulteriore classificazione "
   USE %CLR
-  INPUT CODTAB 103+104 /* SELECT   */
+  INPUT CODTAB[1,1] 103 SELECT
+  INPUT CODTAB[2,2] 105
   DISPLAY "Tipo pagamento" CODTAB[1,1]
   DISPLAY "Classificazione" CODTAB[2,2]
   DISPLAY "Descrizione@50" S0
-  OUTPUT 105 CODTAB
-/*  OUTPUT 103 CODTAB[1,1] */
-/*  CHECKTYPE NORMAL  */
+  OUTPUT 105 CODTAB[2,2]
+  CHECKTYPE NORMAL 
   HELP "Codice per ulteriore classificazione della data"
 END
 					       
-					       
-					       
 BUTTON DLG_OK 9 2
 BEGIN
   PROMPT -13 -1 ""
@@ -191,5 +197,4 @@ BEGIN
 END
 
 ENDPAGE
-
 ENDMASK
diff --git a/ba/ba4200.cpp b/ba/ba4200.cpp
index b46a756b1..3c7c6312f 100755
--- a/ba/ba4200.cpp
+++ b/ba/ba4200.cpp
@@ -157,33 +157,6 @@ void  BA4200_application::init_modify_mode(TMask& m)
   m.disable(DLG_CHGTIP);
 }
 
-
-bool gest_nazionalita(TMask_field& f, KEY key)
-{
-  if (f.mask().query_mode() || key == K_SPACE) return TRUE;
-  TMask&                                msk = f.mask() ;
-  TString                               nazionalita = (const char*)msk.get(FLD_AF1_STATONASC_TABSTE_S0) ;   
-
-  if (f.to_check(key) || nazionalita.empty())
-  {
-    TString                             cod_stato = (const char* ) f.get() ;
-
-    if ( cod_stato.empty() )
-      msk.set(FLD_AF1_STATONASC_TABSTE_S0,"italiana") ;
-    else
-    {
-      TTable                                    t_stati("%STA");
-      TRectype&                         rectab = t_stati.curr() ;
-      rectab.zero() ;
-      rectab.put(N_CODTAB, cod_stato);
-      t_stati.read() ;
-      if ( t_stati.good() )
-        msk.set( FLD_AF1_STATONASC_TABSTE_S0 ,  rectab.get(N_NAZIONALITA) ) ;
-    }
-  }
-  return TRUE ;
-}
-
 bool clear_cap(TMask_field& f, KEY key)
 {                     
   if (f.mask().query_mode() || !f.to_check(key, TRUE)) 
@@ -232,7 +205,7 @@ bool gest_uff_imp(TMask_field& f, KEY key)
   if (f.mask().query_mode() || !f.to_check(key, TRUE)) 
     return TRUE;
 
-  TString       cod_sta, cod_com;
+  TString       cod_com;
   TMask& msk = f.mask() ;
   const short   dlg = f.dlg();
   const bool giuridica = ((BA4200_application&)main_app()).ana_giu();
@@ -240,23 +213,18 @@ bool gest_uff_imp(TMask_field& f, KEY key)
   if ( giuridica )
   {
     cod_com = msk.get(FLD_AG1_COMRF);
-    if ((dlg == FLD_AG2_COMRES) || (dlg == FLD_AG2_STATORES))
+    if (dlg == FLD_AG2_COMRES)
       if (cod_com.not_empty()) return TRUE;
-    cod_sta = msk.get(FLD_AG1_STATORF);
   }
   else
   {
     cod_com = msk.get(FLD_AF2_COMRF);
-    if ((dlg == FLD_AF1_COMRES) || (dlg == FLD_AF1_STATORES))
+    if (dlg == FLD_AF1_COMRES)
       if (cod_com.not_empty()) return TRUE;
-    cod_sta = msk.get(FLD_AF2_STATORF);
   }
   clear_cap(f,key);
   if (cod_com.empty())
-  {
     cod_com = msk.get(giuridica ? FLD_AG2_COMRES : FLD_AF1_COMRES) ;
-    cod_sta = msk.get(giuridica ? FLD_AG2_STATORES : FLD_AF1_STATORES) ;
-  }     
   
   if (cod_com.empty())
     return TRUE;
@@ -264,7 +232,6 @@ bool gest_uff_imp(TMask_field& f, KEY key)
   TLocalisamfile        comuni(LF_COMUNI) ;
   comuni.setkey(1) ;
   comuni.zero() ;
-  comuni.put(N_STATO, cod_sta);
   comuni.put(N_COM, cod_com );
   if (comuni.read() == NOERR)
   {
@@ -387,7 +354,6 @@ TMask* BA4200_application::get_mask(int mode)
     _msk[MSKF]->set_handler(FLD_AF1_COMRES, gest_uff_imp);
     _msk[MSKF]->set_handler(FLD_AF2_COMRF, gest_uff_imp);
     _msk[MSKF]->set_handler(FLD_AF2_COMCORR, clear_cap);
-    _msk[MSKF]->set_handler(FLD_AF1_STATORES, gest_nazionalita);
     _msk[MSKF]->set_handler(FLD_AF1_PAIV, no_dup_iva_f);
     _msk[MSKF]->set_handler(FLD_AF1_COFI, no_dup_fis);
     _msk[MSKF]->set_handler(ba4200_handler);
diff --git a/ba/ba4200.h b/ba/ba4200.h
index 2cfde8b91..9ac4f1cad 100755
--- a/ba/ba4200.h
+++ b/ba/ba4200.h
@@ -139,11 +139,9 @@
 #define FLD_AF1_DATANASC 131
 #define FLD_AF1_INDRES 132
 #define FLD_AF1_PAIV 133
-#define FLD_AF1_STATONASC 134
 #define FLD_AF1_STATONASC_TABSTE_S0 135
 #define FLD_AF1_STATONAZ 136
 #define FLD_AF1_STATOPAIV 137
-#define FLD_AF1_STATORES 138
 #define FLD_AF2_CAPCORR 139
 #define FLD_AF2_CAPRF 140
 #define FLD_AF2_CIVCORR 141
@@ -163,7 +161,6 @@
 #define FLD_AF2_PTELRF 155
 #define FLD_AF2_PTLEXRF 156
 #define FLD_AF2_STATOCORR 157
-#define FLD_AF2_STATORF 158
 #define FLD_AF2_TELRF 159
 #define FLD_AF2_TLEXRF 160
 #define FLD_AF3_DVARSCIV 161
@@ -215,7 +212,6 @@
 #define FLD_AG1_RAGSOC 215
 #define FLD_AG1_SIGLA 216
 #define FLD_AG1_STATOPAIV 217
-#define FLD_AG1_STATORF 218
 #define FLD_AG1_TIPOA 219
 #define FLD_AG1_VALNOM 220
 #define FLD_AG2_CAPCORR 221
@@ -235,7 +231,6 @@
 #define FLD_AG2_PTELRF 235
 #define FLD_AG2_PTLEXRF 236
 #define FLD_AG2_STATOCORR 237
-#define FLD_AG2_STATORES 238
 #define FLD_AG2_TELRF 239
 #define FLD_AG2_TLEXRF 240
 #define FLD_AG3_DATAAPPBIL 241
@@ -327,7 +322,6 @@
 #define FLD_ANAG_RAGSOC2 341
 #define FLD_ANAG_STATOCORR 342
 #define FLD_ANAG_STATOPAIV 343
-#define FLD_ANAG_STATORF 344
 #define FLD_ANAG_TELRF 345
 #define FLD_ANAG_TIPOA 346
 #define FLD_ANAG_TLEXRF 347
@@ -379,5 +373,7 @@
 #define F_NISCRIIDD    402
 #define F_VARSLORES    403
 #define F_DVARSLORES   404
+#define F_COFIEST      405
+#define F_STATO        406
 
 #endif  // __BA4200_H
diff --git a/ba/ba4200b.uml b/ba/ba4200b.uml
index 55b95edf6..d63c3b95c 100755
--- a/ba/ba4200b.uml
+++ b/ba/ba4200b.uml
@@ -133,10 +133,27 @@ BEGIN
   VALIDATE XTZPI_FUNC FLD_AF1_STATOPAIV FLD_AF2_COMRF  FLD_AF1_COMRES
 END
 
+NUMBER F_STATO 3
+BEGIN
+  PROMPT 44 5 "Stato                       "
+  FIELD LF_ANAGFIS->STATO
+  FLAGS "RZ"
+  USE %STA
+  INPUT CODTAB F_STATO
+  DISPLAY "Codice" CODTAB
+  DISPLAY "Stato@50" S0
+  OUTPUT F_STATO CODTAB
+  OUTPUT FLD_AF1_STATONASC_TABSTE_S0 S2
+  HELP "Codice dello stato della persona fisica"
+  CHECKTYPE NORMAL
+  WARNING "Stato assente"
+END
+
 STRING FLD_AF1_STATONASC_TABSTE_S0 10
 BEGIN
   PROMPT 44 6 "Nazionalita'         "
   FIELD LF_ANAGFIS->NAZION
+  FLAGS "D"
   HELP "Nazione di appartenenza della persona fisica"
 END
 
@@ -162,6 +179,13 @@ BEGIN
   VALIDATE XTCF_FUNC FLD_AF1_STATOPAIV LST_AF1_SESSO FLD_AF1_DATANASC FLD_AF1_COMNASC 
 END
 
+STRING F_COFIEST 20
+BEGIN
+  PROMPT 44 8 "C.F.estero "
+  FLAGS "U"
+  FIELD LF_ANAG->COFIEST
+END
+
 GROUPBOX DLG_NULL 76 6
 BEGIN
   PROMPT 0 9 "Dati di nascita"
@@ -172,6 +196,8 @@ BEGIN
   PROMPT 2 10 "Data            "
   FIELD LF_ANAGFIS->DATANASC
   HELP "Data di nascita della persona fisica"
+  WARNING "La data di nascita e' obbligatoria"
+  CHECKTYPE REQUIRED
 END
 
 STRING FLD_AF1_COMNASC 4
@@ -180,24 +206,23 @@ BEGIN
   FIELD LF_ANAGFIS->COMNASC
   FLAGS "U"
   USE LF_COMUNI
-  INPUT STATO FLD_AF1_STATONASC
+  INPUT STATO ""
   INPUT COM FLD_AF1_COMNASC
 #include <comdcod.h>
-  OUTPUT FLD_AF1_STATONASC STATO
   OUTPUT FLD_AF1_COMNASC COM
   OUTPUT FLD_AFIS_COMNASC_COMUNI_DENCOM DENCOM
   OUTPUT FLD_AFIS_COMNASC_COMUNI_PROV PROVCOM
   HELP "Codice del comune di nascita della persona fisica"
-  CHECKTYPE NORMAL
+  CHECKTYPE REQUIRED
   WARNING "Comune assente"
   ADD MASK ba4100a
 END
 
 STRING FLD_AFIS_COMNASC_COMUNI_DENCOM 50
 BEGIN
-  PROMPT 9 12 ": Nome   "
+  PROMPT 9 12 ": Denom. "
   HELP "Nome del comune di nascita della persona fisica"
-  USE LF_COMUNI KEY 2
+  USE LF_COMUNI KEY 2 SELECT STATO==""
   INPUT DENCOM FLD_AFIS_COMNASC_COMUNI_DENCOM
 #include <comdden.h>
   COPY OUTPUT FLD_AF1_COMNASC
@@ -210,21 +235,6 @@ BEGIN
   FLAGS "D"
 END
 
-NUMBER FLD_AF1_STATONASC 3
-BEGIN
-  PROMPT 49 13 "Stato           "
-  FIELD LF_ANAGFIS->STATONASC
-  FLAGS "RZ"
-  USE %STA
-  INPUT CODTAB FLD_AF1_STATONASC
-  DISPLAY "Codice" CODTAB
-  DISPLAY "Stato@50" S0
-  OUTPUT FLD_AF1_STATONASC CODTAB
-  HELP "Codice dello stato di nascita della persona fisica"
-  CHECKTYPE NORMAL
-  WARNING "Stato assente"
-END
-
 GROUPBOX DLG_NULL 76 3
 BEGIN
   PROMPT 0 15 "Ultimo aggiornamento"
@@ -297,30 +307,15 @@ BEGIN
   HELP "Numero civico della residenza"
 END
 
-NUMBER FLD_AF1_STATORES 3
-BEGIN
-  PROMPT 2 7 "Comune : Stato  "
-  FIELD LF_ANAG->STATORES
-  FLAGS "RZ"
-  COPY USE FLD_AF1_STATONASC
-  INPUT CODTAB FLD_AF1_STATORES
-  COPY DISPLAY FLD_AF1_STATONASC
-  OUTPUT FLD_AF1_STATORES CODTAB
-  HELP "Codice dello stato di residenza"
-  CHECKTYPE NORMAL
-  WARNING "Stato assente"
-END
-
 STRING FLD_AF1_COMRES 4
 BEGIN
-  PROMPT 9 8 ": Codice "
+  PROMPT 2 7 "Comune : Codice "
   FIELD LF_ANAG->COMRES
   FLAGS "U"
   COPY USE FLD_AF1_COMNASC
-  INPUT STATO FLD_AF1_STATORES
+  INPUT STATO ""
   INPUT COM FLD_AF1_COMRES
   COPY DISPLAY FLD_AF1_COMNASC
-  OUTPUT FLD_AF1_STATORES STATO
   OUTPUT FLD_AF1_COMRES COM
   OUTPUT FLD_AF1_COMRES_COMUNI_DENCOM DENCOM
   OUTPUT FLD_AF1_COMRES_COMUNI_PROVCOM PROVCOM
@@ -333,25 +328,24 @@ END
 
 STRING FLD_AF1_COMRES_COMUNI_PROVCOM 5
 BEGIN
-  PROMPT 38 8 "Provincia "
+  PROMPT 38 7 "Provincia "
   FLAGS "D"
 END
 
 STRING FLD_ANAG_CAPRES 5
 BEGIN
-  PROMPT 56 8 "CAP    "
+  PROMPT 56 7 "CAP    "
   FIELD LF_ANAG->CAPRES
   HELP "CAP del comune di residenza"
 END
 
 STRING FLD_AF1_COMRES_COMUNI_DENCOM 50
 BEGIN
-  PROMPT 9 9 ": Nome   "
+  PROMPT 9 8 ": Denom. "
   HELP "Nome del comune di residenza"
   COPY USE FLD_AFIS_COMNASC_COMUNI_DENCOM
   INPUT DENCOM FLD_AF1_COMRES_COMUNI_DENCOM
   COPY DISPLAY FLD_AFIS_COMNASC_COMUNI_DENCOM
-  OUTPUT FLD_AF1_STATORES STATO
   OUTPUT FLD_AF1_COMRES COM
   OUTPUT FLD_AF1_COMRES_COMUNI_DENCOM DENCOM
   OUTPUT FLD_AF1_COMRES_COMUNI_PROVCOM PROVCOM
@@ -359,6 +353,13 @@ BEGIN
   ADD MASK ba4100a
 END
 
+BOOLEAN CHK_AF4_SOGGNRES
+BEGIN
+  PROMPT 2 9 "Non residente"
+  FIELD LF_ANAG->SOGGNRES
+  HELP "Dire se si tratta di persone non residente"
+END
+
 GROUPBOX DLG_NULL 76 6
 BEGIN
   PROMPT 0 11 "Domicilio Fiscale (solo se diverso)"
@@ -380,30 +381,15 @@ BEGIN
   HELP "Inserire il numero civico della domicilio fiscale"
 END
 
-NUMBER FLD_AF2_STATORF 3
-BEGIN
-  PROMPT 2 13 "Comune : Stato  "
-  FIELD LF_ANAG->STATORF
-  FLAGS "RZ"
-  COPY USE FLD_AF1_STATONASC
-  INPUT CODTAB FLD_AF2_STATORF
-  COPY DISPLAY FLD_AF1_STATONASC
-  OUTPUT FLD_AF2_STATORF CODTAB
-  HELP "Inserire il codice dello stato di domicilio fiscale"
-  CHECKTYPE NORMAL
-  WARNING "Stato assente"
-END
-
 STRING FLD_AF2_COMRF 4
 BEGIN
-  PROMPT 9 14 ": Codice "
+  PROMPT 2 13 "Comune : Codice "
   FIELD LF_ANAG->COMRF
   FLAGS "U"
   COPY USE FLD_AF1_COMNASC
-  INPUT STATO FLD_AF2_STATORF
+  INPUT STATO ""
   INPUT COM FLD_AF2_COMRF
   COPY DISPLAY FLD_AF1_COMNASC
-  OUTPUT FLD_AF2_STATORF STATO
   OUTPUT FLD_AF2_COMRF COM
   OUTPUT FLD_AF2_COMRF_COMUNI_DENCOM DENCOM
   OUTPUT FLD_AF2_COMRF_COMUNI_PROVCOM PROVCOM
@@ -416,25 +402,24 @@ END
 
 STRING FLD_AF2_COMRF_COMUNI_PROVCOM 5
 BEGIN
-  PROMPT 38 14 "Provincia "
+  PROMPT 38 13 "Provincia "
   FLAGS "D"
 END
 
 STRING FLD_AF2_CAPRF 5
 BEGIN
-  PROMPT 56 14 "CAP    "
+  PROMPT 56 13 "CAP    "
   FIELD LF_ANAG->CAPRF
   HELP "Inserire il CAP del comune di domicilio fiscale"
 END
 
 STRING FLD_AF2_COMRF_COMUNI_DENCOM 50
 BEGIN
-  PROMPT 9 15 ": Nome   "
+  PROMPT 9 14 ": Denom. "
   HELP "Nome del comune di residenza fiscale"
   COPY USE FLD_AFIS_COMNASC_COMUNI_DENCOM
   INPUT DENCOM FLD_AF2_COMRF_COMUNI_DENCOM
   COPY DISPLAY FLD_AFIS_COMNASC_COMUNI_DENCOM
-  OUTPUT FLD_AF2_STATORF STATO
   OUTPUT FLD_AF2_COMRF COM
   OUTPUT FLD_AF2_COMRF_COMUNI_DENCOM DENCOM
   OUTPUT FLD_AF2_COMRF_COMUNI_PROVCOM PROVCOM
@@ -501,14 +486,13 @@ BEGIN
   PROMPT 2 7 "Comune : Stato  "
   FIELD LF_ANAG->STATOCORR
   FLAGS "RZ"
-  COPY USE FLD_AF1_STATONASC
+  COPY USE F_STATO
   INPUT CODTAB FLD_AF2_STATOCORR
-  COPY DISPLAY FLD_AF1_STATONASC
+  COPY DISPLAY F_STATO
   OUTPUT FLD_AF2_STATOCORR CODTAB
   HELP "Codice dello stato al quale spedire la corrispondenza"
   CHECKTYPE NORMAL
   WARNING "Stato assente"
-  VALIDATE EMPTYCOPY_FUNC FLD_AF1_STATORES
 END
 
 STRING FLD_AF2_COMCORR 4
@@ -549,7 +533,7 @@ END
 
 STRING FLD_AF2_COMCORR_COMUNI_DENCOM 50
 BEGIN
-  PROMPT 9 9 ": Nome   "
+  PROMPT 9 9 ": Denom. "
   HELP "Nome del comune al quale spedire la corrispondenza"
   COPY USE FLD_AFIS_COMNASC_COMUNI_DENCOM
   INPUT DENCOM FLD_AF2_COMCORR_COMUNI_DENCOM
@@ -856,16 +840,9 @@ BEGIN
   HELP "Data di variazione della sede legale o residenza"
 END
 
-BOOLEAN CHK_AF4_SOGGNRES
-BEGIN
-  PROMPT 2 9 "Non residente"
-  FIELD LF_ANAG->SOGGNRES
-  HELP "Dire se si tratta di persone non residente"
-END
-
 BOOLEAN FLD_AF4_RFDIVERSA 
 BEGIN
-  PROMPT 2 11 "Domicilio fiscale diverso da sede legale "
+  PROMPT 2 9 "Domicilio fiscale diverso da sede legale "
   FIELD LF_ANAG->RFDIVERSA
   HELP "Dire se il domicilio fiscale e' diverso della sede legale"
 END
@@ -969,7 +946,7 @@ BEGIN
   GROUP 3
 END
 
-GROUPBOX DLG_NULL 76 8
+GROUPBOX DLG_NULL 76 9
 BEGIN
   PROMPT 0 5 "Uffici competenti"
 END
diff --git a/ba/ba4200c.uml b/ba/ba4200c.uml
index 108a37c4f..16b306b86 100755
--- a/ba/ba4200c.uml
+++ b/ba/ba4200c.uml
@@ -107,7 +107,7 @@ END
 
 STRING FLD_AG1_COFI 12
 BEGIN
-  PROMPT 46 5 "Codice fiscale "
+  PROMPT 42 5 "Codice fiscale     "
   FIELD LF_ANAG->COFI
   FLAGS "U"
   HELP "Codice fiscale della persona giuridica"
@@ -123,6 +123,13 @@ BEGIN
   KEY 3
 END
 
+STRING F_COFIEST 20
+BEGIN
+  PROMPT 42 6 "C.F.estero "
+  FLAGS "U"
+  FIELD LF_ANAG->COFIEST
+END
+
 GROUPBOX DLG_NULL 76 5
 BEGIN
   PROMPT 0 8 "Dati societari "
@@ -220,31 +227,15 @@ BEGIN
   HELP "Numero civico della sede legale"
 END
 
-NUMBER FLD_AG2_STATORES 3
-BEGIN
-  PROMPT 2 6 "Comune : Stato  "
-  FIELD LF_ANAG->STATORES
-  FLAGS "RZ"
-  USE %STA
-  INPUT CODTAB FLD_AG2_STATORES
-  DISPLAY "Codice" CODTAB
-  DISPLAY "Stato@50" S0
-  OUTPUT FLD_AG2_STATORES CODTAB
-  HELP "Codice dello stato sede"
-  CHECKTYPE NORMAL
-  WARNING "Stato assente"
-END
-
 STRING FLD_AG2_COMRES 4
 BEGIN
-  PROMPT 9 7 ": Codice "
+  PROMPT 2 6 "Comune : Codice "
   FIELD LF_ANAG->COMRES
   FLAGS "U"
   USE LF_COMUNI
-  INPUT STATO FLD_AG2_STATORES
+  INPUT STATO ""
   INPUT COM FLD_AG2_COMRES
 #include <comdcod.h>
-  OUTPUT FLD_AG2_STATORES STATO
   OUTPUT FLD_AG2_COMRES COM
   OUTPUT FLD_AG2_COMRES_COMUNI_DENCOM DENCOM
   OUTPUT FLD_AG2_COMRES_COMUNI_PROVCOM PROVCOM
@@ -257,30 +248,36 @@ END
 
 STRING FLD_AG2_COMRES_COMUNI_PROVCOM 5
 BEGIN
-  PROMPT 38 7 "Provincia "
+  PROMPT 38 6 "Provincia "
   FLAGS "D"
 END
 
 STRING FLD_AG2_CAPRES 5
 BEGIN
-  PROMPT 56 7 "CAP    "
+  PROMPT 56 6 "CAP    "
   FIELD LF_ANAG->CAPRES
   HELP "CAP del comune sede legale"
 END
 
 STRING FLD_AG2_COMRES_COMUNI_DENCOM 50
 BEGIN
-  PROMPT 9 8 ": Nome   "
+  PROMPT 9 7 ": Denom. "
   HELP "Nome del comune sede legale"
-  USE LF_COMUNI KEY 2
+  USE LF_COMUNI KEY 2 SELECT STATO==""
   INPUT DENCOM FLD_AG2_COMRES_COMUNI_DENCOM
 #include <comdden.h>
-  OUTPUT FLD_AG2_STATORES STATO
   OUTPUT FLD_AG2_COMRES COM
   OUTPUT FLD_AG2_COMRES_COMUNI_DENCOM DENCOM
   OUTPUT FLD_AG2_COMRES_COMUNI_PROVCOM PROVCOM
   OUTPUT FLD_AG2_CAPRES CAPCOM
-	ADD MASK ba4100a
+  ADD MASK ba4100a
+END
+
+BOOLEAN CHK_AG5_NONRES
+BEGIN
+  PROMPT 2 8 "Non residente"
+  FIELD LF_ANAG->SOGGNRES
+  HELP "Indicare se si tratta di persona giuridica non residente"
 END
 
 GROUPBOX DLG_NULL 76 6
@@ -304,30 +301,15 @@ BEGIN
   HELP "Numero civico della domicilio fiscale della ditta"
 END
 
-NUMBER FLD_AG1_STATORF 3
-BEGIN
-	PROMPT 2 12 "Comune : Stato  "
-  FIELD LF_ANAG->STATORF
-  FLAGS "RZ"
-  COPY USE FLD_AG2_STATORES
-  INPUT CODTAB FLD_AG2_STATORES
-  COPY DISPLAY FLD_AG2_STATORES
-  OUTPUT FLD_AG1_STATORF CODTAB
-  HELP "Codice dello stato domicilio fiscale della ditta"
-  CHECKTYPE NORMAL
-  WARNING "Stato assente"
-END
-
 STRING FLD_AG1_COMRF 4
 BEGIN
-  PROMPT 9 13 ": Codice "
-	FIELD LF_ANAG->COMRF
-	FLAGS "U"
-	COPY USE FLD_AG2_COMRES
-	INPUT STATO FLD_AG1_STATORF
+  PROMPT 2 12 "Comune : Codice "
+  FIELD LF_ANAG->COMRF
+  FLAGS "U"
+  COPY USE FLD_AG2_COMRES
+	INPUT STATO ""
 	INPUT COM FLD_AG1_COMRF
 	COPY DISPLAY FLD_AG2_COMRES
-	OUTPUT FLD_AG1_STATORF STATO
 	OUTPUT FLD_AG1_COMRF COM
 	OUTPUT FLD_AG1_COMRF_COMUNI_DENCOM DENCOM
 	OUTPUT FLD_AG1_COMRF_COMUNI_PROVCOM PROVCOM
@@ -340,26 +322,25 @@ END
 
 STRING FLD_AG1_COMRF_COMUNI_PROVCOM 5
 BEGIN
-	PROMPT 38 13 "Provincia "
+	PROMPT 38 12 "Provincia "
 	FLAGS "D"
 END
 
 STRING FLD_AG1_CAPRF 5
 BEGIN
-	PROMPT 56 13 "CAP    "
+	PROMPT 56 12 "CAP    "
 	FIELD LF_ANAG->CAPRF
 	HELP "CAP del comune domicilio fiscale della ditta"
 END
 
 STRING FLD_AG1_COMRF_COMUNI_DENCOM 50
 BEGIN
-	PROMPT 9 14 ": Nome   "
+	PROMPT 9 13 ": Denom. "
         HELP "Nome del comune residenza fiscale"
-	USE LF_COMUNI KEY 2
+	USE LF_COMUNI KEY 2 SELECT STATO==""
 	COPY USE FLD_AG2_COMRES_COMUNI_DENCOM
 	INPUT DENCOM FLD_AG1_COMRF_COMUNI_DENCOM
 	COPY DISPLAY FLD_AG2_COMRES_COMUNI_DENCOM
-	OUTPUT FLD_AG1_STATORF STATO
 	OUTPUT FLD_AG1_COMRF COM
 	OUTPUT FLD_AG1_COMRF_COMUNI_DENCOM DENCOM
 	OUTPUT FLD_AG1_COMRF_COMUNI_PROVCOM PROVCOM
@@ -419,13 +400,13 @@ BEGIN
 	PROMPT 2 6 "Comune : Stato  "
   FIELD LF_ANAG->STATOCORR
   FLAGS "RZ"
-  COPY USE FLD_AG2_STATORES
+  USE %STA 
   INPUT CODTAB FLD_AG2_STATOCORR
-  INPUT CODTAB FLD_AG2_STATORES
+  DISPLAY "Codice" CODTAB
+  DISPLAY "Stato@50" S0
   OUTPUT FLD_AG2_STATOCORR CODTAB
   HELP "Codice dello stato a cui mandare la corrispondenza"
   CHECKTYPE NORMAL
-  VALIDATE EMPTYCOPY_FUNC FLD_AG2_STATORES
 END
 
 STRING FLD_AG2_COMCORR 4
@@ -466,7 +447,7 @@ END
 
 STRING FLD_AG2_COMCORR_COMUNI_DENCOM 50
 BEGIN
-	PROMPT 9 8 ": Nome   "
+	PROMPT 9 8 ": Denom. "
         HELP "Nome del comune a cui mandare la corrispondenza"
 	COPY USE FLD_AG2_COMRES_COMUNI_DENCOM
 	INPUT DENCOM FLD_AG2_COMCORR_COMUNI_DENCOM
@@ -668,13 +649,6 @@ BEGIN
   HELP "Data di chiusura dell'anno di contabilita'"
 END
 
-BOOLEAN CHK_AG5_NONRES
-BEGIN
-  PROMPT 29 12 "Non residente"
-  FIELD LF_ANAG->SOGGNRES
-  HELP "Indicare se si tratta di persona giuridica non residente"
-END
-
 NUMBER LST_AG3_STATOSOC 1
 BEGIN
   PROMPT 2 15 "Stato Societa'  "
@@ -1082,7 +1056,7 @@ BEGIN
   GROUP 2
 END
 
-GROUPBOX DLG_NULL 76 8
+GROUPBOX DLG_NULL 76 9
 BEGIN
   PROMPT 0 5 "Uffici competenti"
 END
diff --git a/ba/ba4300.cpp b/ba/ba4300.cpp
index 1f8f6880c..4564d13e0 100755
--- a/ba/ba4300.cpp
+++ b/ba/ba4300.cpp
@@ -297,12 +297,16 @@ void TDitte_application::init_query_mode(TMask& m)
   if (filtered())
   {
     m.show(FLD_GD1_CODDITTAH);
+    m.show(FLD_GD1_RAGSOCH);
     m.hide(FLD_GD1_CODDITTA);
+    m.hide(FLD_GD1_RAGSOC);
   }
   else
   {
     m.show(FLD_GD1_CODDITTA);
+    m.show(FLD_GD1_RAGSOC);
     m.hide(FLD_GD1_CODDITTAH);
+    m.hide(FLD_GD1_RAGSOCH);
   }
   init_insert_mode(m);
 }
@@ -315,12 +319,16 @@ void TDitte_application::init_insert_mode(TMask& m)
     m.enable(FLD_GD1_CODANAGR);
     m.enable(FLD_GD1_CODANAGR_ANAGR_RAGSOC);
     m.show(FLD_GD1_CODDITTA);
+    m.show(FLD_GD1_RAGSOC);
     m.hide(FLD_GD1_CODDITTAH);
+    m.hide(FLD_GD1_RAGSOCH);
   }
   else
   {
     m.show(FLD_GD1_CODDITTAH);
+    m.show(FLD_GD1_RAGSOCH);
     m.hide(FLD_GD1_CODDITTA);
+    m.hide(FLD_GD1_RAGSOC);
   }
   m.disable(DLG_ATT);
   m.disable(DLG_ULC);
@@ -345,12 +353,16 @@ void TDitte_application::init_modify_mode(TMask& m)
   if (filtered())
   {
     m.show(FLD_GD1_CODDITTAH);
+    m.show(FLD_GD1_RAGSOCH);
+    m.hide(FLD_GD1_RAGSOC);
     m.hide(FLD_GD1_CODDITTA);
   }
   else
   {
     m.show(FLD_GD1_CODDITTA);
+    m.show(FLD_GD1_RAGSOC);
     m.hide(FLD_GD1_CODDITTAH);
+    m.hide(FLD_GD1_RAGSOCH);
   }
   m.enable(DLG_ATT);
   m.enable(DLG_ULC);
diff --git a/ba/ba4300.h b/ba/ba4300.h
index 952616a24..c93c0283e 100755
--- a/ba/ba4300.h
+++ b/ba/ba4300.h
@@ -30,8 +30,6 @@
 #define FN_CODSTAT3 "CODSTAT3"  /* FLD_GD2_CODSTAT3 */
 #define FN_CABBAN "CABBAN"      /* FLD_GD2_CABBAN */
 #define FN_ABIBAN "ABIBAN"      /* FLD_GD2_ABIBAN */
-#define FN_SITSOC "SITSOC"      /* LST_GD2_SITSOC */
-#define FN_STATOSOC "STATOSOC"  /* LST_GD2_STATOSOC */
 #define FN_DENEST1 "DENEST1"    /* FLD_DE_DENEST1 */
 #define FN_DENEST2 "DENEST2"    /* FLD_DE_DENEST2 */
 #define FN_DENEST3 "DENEST3"    /* FLD_DE_DENEST3 */
@@ -92,8 +90,6 @@
 #define FLD_GD2_CABBAN_TABBANCHE_DESCR 149
 #define FLD_GD2_ABIBAN 150
 #define FLD_GD2_ABIBAN_TABBANCHE_DESCR 151
-#define LST_GD2_SITSOC 152
-#define FLD_GD2_STATOSOC 153
 #define LST_GD2_DATLAV 154
 #define BUT_DENEST 155
 #define FLD_GD1_CODANAGR_ANAGR_RAGSOC 157
@@ -128,5 +124,6 @@
 #define DLG_SOC 187 
 #define DLG_REG 188 
 #define F_ISCRCAF 189
+#define FLD_GD1_RAGSOCH 190
 
 #endif // __BA4300_H
diff --git a/ba/ba4300a.uml b/ba/ba4300a.uml
index ad91bef66..102b395ed 100755
--- a/ba/ba4300a.uml
+++ b/ba/ba4300a.uml
@@ -2,25 +2,25 @@
 
 TOOLBAR "" 0 19 0 3 
 
-BUTTON DLG_ATT 8 1
+BUTTON DLG_ATT 9 1
 BEGIN
 	PROMPT -16 -3 "Attivita'"
 	MESSAGE K_F6
 END
 
-BUTTON DLG_ULC 8 1
+BUTTON DLG_ULC 9 1
 BEGIN
 	PROMPT -26 -3 "U.Locali"
 	MESSAGE K_F5
 END
 
-BUTTON DLG_SOC 8 1
+BUTTON DLG_SOC 9 1
 BEGIN
   PROMPT -36 -3 "Soci"
   MESSAGE K_F7
 END
 
-BUTTON DLG_REG 8 1
+BUTTON DLG_REG 9 1
 BEGIN
   PROMPT -46 -3 "Registri"
   MESSAGE K_F8
@@ -50,31 +50,27 @@ BEGIN
 	OUTPUT FLD_GD1_CODDITTA CODDITTA
 	OUTPUT FLD_GD1_CODDITTAH CODDITTA
 	OUTPUT FLD_GD1_RAGSOC RAGSOC
+	OUTPUT FLD_GD1_RAGSOCH RAGSOC
 	HELP "Codice della ditta"
 	CHECKTYPE REQUIRED
-	MESSAGE COPY,1@
-	MESSAGE COPY,FLD_GD1_CODDITTAH
+	MESSAGE COPY,1@|COPY,FLD_GD1_CODDITTAH
 END
 
 NUMBER FLD_GD1_CODDITTAH 5
 BEGIN
 	PROMPT 1 1 "Codice          "
+	KEY 1
 	HELP "Codice della ditta"
 	FIELD LF_NDITTE->CODDITTA
 	FLAGS "RG"
 	USE LF_NDITTE KEY 3
-	INPUT TIPOA FLD_GD1_TIPOA
-	INPUT CODANAGR FLD_GD1_CODANAGR
+	INPUT TIPOA FLD_GD1_TIPOA SELECT 
+	INPUT CODANAGR FLD_GD1_CODANAGR SELECT
 	INPUT CODDITTA FLD_GD1_CODDITTAH
-	DISPLAY "Codice" CODDITTA
-	DISPLAY "Cognome - Nome o Ragione sociale@50" RAGSOC
-	OUTPUT FLD_GD1_CODDITTAH CODDITTA
-	OUTPUT FLD_GD1_CODDITTA CODDITTA
-	OUTPUT FLD_GD1_RAGSOC RAGSOC
+	COPY DISPLAY FLD_GD1_CODDITTA
+        COPY OUTPUT FLD_GD1_CODDITTA
 	CHECKTYPE REQUIRED
-	MESSAGE COPY,1@
-	MESSAGE COPY,FLD_GD1_CODDITTA
-	KEY 1
+	MESSAGE COPY,1@|COPY,FLD_GD1_CODDITTA
 END
 
 STRING FLD_GD1_RAGSOC 50
@@ -84,18 +80,32 @@ BEGIN
 	KEY 2
 	USE LF_NDITTE KEY 2
 	INPUT RAGSOC FLD_GD1_RAGSOC
-	INPUT CODDITTA FLD_GD1_CODDITTA
-	DISPLAY "Codice" CODDITTA
 	DISPLAY "Cognome - Nome o Ragione sociale@50" RAGSOC
-	OUTPUT FLD_GD1_CODDITTA CODDITTA
-	OUTPUT FLD_GD1_RAGSOC RAGSOC
+	DISPLAY "Codice" CODDITTA
+	COPY OUTPUT FLD_GD1_CODDITTA
         HELP "Ragione sociale della ditta"
         WARNING "La ragione sociale e' obbligatoria"
 	CHECKTYPE REQUIRED
 	FLAGS "G"
-	MESSAGE COPY,2@
+	MESSAGE COPY,2@|COPY,FLD_GD1_RAGSOCH
 END
 
+STRING FLD_GD1_RAGSOCH 50
+BEGIN
+	PROMPT 1 2 "Ragione sociale "
+	FIELD LF_NDITTE->RAGSOC
+	KEY 2
+	USE LF_NDITTE KEY 2 SELECT (TIPOA==#FLD_GD1_TIPOA) && (CODANAGR==#FLD_GD1_CODANAGR)
+	COPY INPUT FLD_GD1_RAGSOC
+	COPY DISPLAY FLD_GD1_RAGSOC
+	COPY OUTPUT FLD_GD1_RAGSOC
+        HELP "Ragione sociale della ditta"
+        WARNING "La ragione sociale e' obbligatoria"
+	CHECKTYPE REQUIRED
+	MESSAGE COPY,2@|COPY,FLD_GD1_RAGSOC
+        FLAGS "HG"
+END 
+
 GROUPBOX DLG_NULL 76 4
 BEGIN
   PROMPT 0 4 "Anagrafica"
@@ -164,14 +174,20 @@ BEGIN
   OUTPUT FLD_GD1_CODATTPREV_TABATT_DESCR S0
   HELP "Codice dell'attivita' prevalente della ditta"
   CHECKTYPE REQUIRED
-  WARNING "Codice attivita' assente"
+  WARNING "Attivita' assente"
 END
 
 STRING FLD_GD1_CODATTPREV_TABATT_DESCR 50
 BEGIN
   PROMPT 1 10 "Descrizione     "
-  FLAGS "D"
-  HELP ""
+  USE %AIS KEY 2
+  INPUT S0 FLD_GD1_CODATTPREV_TABATT_DESCR
+  DISPLAY "Attivita'@50" S0
+  DISPLAY "Codice" CODTAB
+  COPY OUTPUT FLD_GD1_CODATTPREV
+  HELP "Descrizione dell'attivita' prevalente della ditta"
+  CHECKTYPE NORMAL
+  WARNING "Attivita' assente"
 END
 
 GROUPBOX DLG_NULL 76 4
@@ -259,8 +275,6 @@ BEGIN
   PROMPT 1 8 "Artigiano"
   FIELD LF_NDITTE->ARTIG
   HELP "Dire se si tratta di una ditta artigiana"
-  MESSAGE FALSE DISABLE,3@|RESET,3@
-  MESSAGE TRUE ENABLE,3@
 END
 
 GROUPBOX DLG_NULL 76 5
@@ -426,7 +440,7 @@ NUMBER FLD_GD2_MESIREDD 3
 BEGIN
   PROMPT 45 6 "Mesi produzione reddito "
   FIELD LF_NDITTE->MESIREDD
-	NUM_EXPR {(#THIS_FIELD>=0) && (#THIS_FIELD<=12)}
+  NUM_EXPR {(#THIS_FIELD>=0) && (#THIS_FIELD<=12)}
   FLAGS "R"
   HELP "Numero di mesi di produzione reddito"
   WARNING "Numero di mesi non corretto"
@@ -465,39 +479,15 @@ END
 STRING FLD_GD2_ABIBAN_TABBANCHE_DESCR 47
 BEGIN
   PROMPT 25 8 ""
-  FLAGS "D"
-END
-
-NUMBER LST_GD2_SITSOC 1
-BEGIN
-  PROMPT 45 9 "Situazione societa'       "
-  FIELD LF_NDITTE->SITSOC
-  SHEET "Codice|Situazione@70"
-  INPUT LST_GD2_SITSOC
-  OUTPUT LST_GD2_SITSOC
-  HELP "Codice della situazione della societa'"
-  ITEM " |Sconosciuta"
-  ITEM "1|Periodo d'imposta in cui ha avuto inizio la liquidazione"
-  ITEM "2|Periodi d'imposta successivi a quello in cui ha avuto inizio la liquidazione"
-  ITEM "3|Periodo d'imposta in cui ha avuto termine la liquidazione"
-  ITEM "4|Periodo d'imposta in cui si e' verificata l' estinzione del soggetto"
-  ITEM "5|Periodo d'imposta in cui si e' variato l' assoggettamento IRPEG del soggetto"
-  ITEM "6|Periodo d'imposta normale"
-END
-
-NUMBER LST_GD2_STATOSOC 1
-BEGIN
-  PROMPT 1 9 "Stato societa'  "
-  FIELD LF_NDITTE->STATOSOC
-  SHEET "Codice|Stato@70"
-  INPUT LST_GD2_STATOSOC
-  OUTPUT LST_GD2_STATOSOC
-  HELP "Codice dello stato della societa'"
-  ITEM " |Sconosciuto"
-  ITEM "1|Soggetto in normale attivita'"
-  ITEM "2|Soggetto in liquidazione per cessazione di attivita'"
-  ITEM "3|Soggetto in fallimento o in liquidazione coatta amministrativa"
-  ITEM "4|Soggetto estinto"
+  USE %BAN KEY 2
+  INPUT S0 FLD_GD2_ABIBAN_TABBANCHE_DESCR
+  DISPLAY "Denominazione@50" S0
+  DISPLAY "ABI  " CODTAB[1,5]
+  DISPLAY "CAB  " CODTAB[6,10]
+  COPY OUTPUT FLD_GD2_ABIBAN
+  HELP "Nome della banca della ditta"
+  CHECKTYPE NORMAL
+  WARNING "Banca assente"
 END
 
 GROUPBOX DLG_NULL 76 5
diff --git a/ba/ba4400a.uml b/ba/ba4400a.uml
index dc7a11678..c1ac7d0c1 100755
--- a/ba/ba4400a.uml
+++ b/ba/ba4400a.uml
@@ -4,11 +4,11 @@ TOOLBAR "" 0 20 0 2
 #include <toolbar.h>
 ENDPAGE
 
-PAGE "Unit… locali 1/2" -1 -1 77 18
+PAGE "Unita' locali 1/2" -1 -1 77 18
 
 GROUPBOX DLG_NULL 76 6
 BEGIN
-  PROMPT 0 0 "Unit… locale"
+  PROMPT 0 0 "Unita' locale"
 	FLAGS "R"
 END
 
@@ -244,11 +244,11 @@ END
 
 ENDPAGE
 
-PAGE "Unit… locali 2/2" -1 -1 77 18
+PAGE "Unita' locali 2/2" -1 -1 77 18
 
 GROUPBOX DLG_NULL 76 6
 BEGIN
-  PROMPT 0 0 "Unit… locale"
+  PROMPT 0 0 "Unita' locale"
 	FLAGS "R"
 END
 
@@ -366,20 +366,20 @@ END
 
 STRING FLD_UL2_COMTRIB 4
 BEGIN
-	PROMPT 1 11 "Comune "
-	FIELD LF_UNLOC->COMTRIB
+  PROMPT 1 11 "Comune "
+  FIELD LF_UNLOC->COMTRIB
   FLAGS "U"
   GROUP 1
-	COPY USE FLD_UL1_COMULC
-	INPUT STATO ""
-	INPUT COM FLD_UL2_COMTRIB
-	COPY DISPLAY FLD_UL1_COMULC
-	OUTPUT FLD_UL2_COMTRIB COM
-	OUTPUT FLD_UL2_COMTRIB_COMUNI_DENCOM DENCOM
-	OUTPUT FLD_UL2_CAPTRIB CAPCOM
-        HELP "Codice del comune del tribunale"
+  COPY USE FLD_UL1_COMULC
+  INPUT STATO ""
+  INPUT COM FLD_UL2_COMTRIB
+  COPY DISPLAY FLD_UL1_COMULC
+  OUTPUT FLD_UL2_COMTRIB COM
+  OUTPUT FLD_UL2_COMTRIB_COMUNI_DENCOM DENCOM
+  OUTPUT FLD_UL2_CAPTRIB CAPCOM
+  HELP "Codice del comune del tribunale"
   CHECKTYPE NORMAL    
- 	VALIDATE EMPTYCOPY_FUNC FLD_UL1_COMULC
+  VALIDATE EMPTYCOPY_FUNC FLD_UL1_COMULC
   WARNING "Comune assente"
 END
 
@@ -400,13 +400,18 @@ BEGIN
   COPY DISPLAY FLD_UL1_COMULC_COMUNI_DENCOM
   OUTPUT FLD_UL2_COMTRIB COM
   OUTPUT FLD_UL2_COMTRIB_COMUNI_DENCOM DENCOM
-	OUTPUT FLD_UL2_CAPTRIB CAPCOM
-	ADD MASK ba4100a
+  OUTPUT FLD_UL2_CAPTRIB CAPCOM
+  ADD MASK ba4100a
+END
+
+GROUPBOX DLG_NULL 76 3
+BEGIN
+  PROMPT 0 14 "Locali destinati all' attivita'"
 END
 
 NUMBER FLD_UL2_MQULC 6
 BEGIN
-  PROMPT 1 14 "Mq. Locali        "
+  PROMPT 1 15 "Mq. Locali        "
   FIELD LF_UNLOC->MQULC
   FLAGS "R"
   HELP "Numero di metri quadri dei locali"
@@ -416,7 +421,7 @@ END
 
 NUMBER FDL_UL2_MQULCMAG 6
 BEGIN
-  PROMPT 45 14 "Di cui a magazzino    "
+  PROMPT 45 15 "Di cui a magazzino    "
   FIELD LF_UNLOC->MQULCMAG
   FLAGS "R"
   HELP "Numero di metri quadri del locale adibiti a magazzino"
diff --git a/ba/ba4500.cpp b/ba/ba4500.cpp
index 2e02accc7..e3792af78 100755
--- a/ba/ba4500.cpp
+++ b/ba/ba4500.cpp
@@ -1,143 +1,145 @@
-#include <relapp.h>
-#include <stdtypes.h>
-#include <lffiles.h>
-#include "ba4.h"
-#include "ba4500.h"
-
-class BA4500_application : public TRelation_application
-{
-  TMask* _msk;
-	TRelation* _rel;
-  TLocalisamfile* _anag;
-  TLocalisamfile* _ditte;
-
-  bool user_create() ;                         
-  bool user_destroy() ;                        
-	virtual TMask* get_mask(int mode) { return _msk;}
-	virtual bool changing_mask(int mode) { return FALSE;}
-	virtual TRelation* get_relation() const { return _rel;}
-	virtual int read(TMask& m);
-  virtual void init_query_mode(TMask& m) ;
-  virtual void init_query_insert_mode(TMask& m) ;
-
-public:
-  BA4500_application() {}
-  virtual ~BA4500_application() {}
-};
-
-bool gest_res(TMask_field& f, KEY key)
-{
-
-	if (!f.to_check(key)) return TRUE;
-	
- 	TLocalisamfile	anagr(LF_ANAG) ;
-	TMask&					msk = f.mask() ;
-
-	anagr.curr().zero();
-	anagr.curr().put(N_TIPOA, msk.get(LST_AT2_TIPOADS));
-	anagr.curr().put(N_CODANAGR, msk.get(FLD_AT2_CODANGRDS));
-	anagr.read();
-	if (anagr.bad())
-		return f.error_box("Anagrafica assente");
-
-	TArray comarr(2), f1(2), f2(2), f3(2);
-	TString					cod_com = anagr.curr().get(N_CODCOMRF);
-	
-	comarr.add(cod_com);
-	cod_com = anagr.curr().get(N_CODCOMRES);
-	comarr.add(cod_com);
-	cod_com = N_INDRF;
-	f1.add(cod_com);
-	cod_com = N_CIVRF;
-	f2.add(cod_com);
-	cod_com = N_CAPRF;
-	f3.add(cod_com);
-	cod_com = N_INDRES;
-	f1.add(cod_com);
-	cod_com = N_CIVRES;
-	f2.add(cod_com);
-	cod_com = N_CAPRES;
-	f3.add(cod_com);
-
-	TLocalisamfile	comuni(LF_COMUNI) ;
-	TRectype&				rec = comuni.curr() ;
-
-	for (int i = 0; i < comarr.items(); i++)
-	{
-		cod_com = (TString&) comarr[i];
-    if ( cod_com.not_empty() )
-		{
-			rec.zero() ;
-			rec.put(N_STATO, anagr.curr().get(N_STATORF));
-			rec.put(N_COM, cod_com );
-			comuni.setkey(1) ;
-			comuni.read() ;
-			if ( comuni.good() )
-			{
-				msk.set( FLD_AT2_ANAGR_DEP_IND ,  (const char*) anagr.curr().get((TString&) f1[i]) ) ; 
-				msk.set( FLD_AT2_ANAGR_DEP_CIV ,  (const char*) anagr.curr().get((TString&) f2[i]) ) ; 
-				msk.set( FLD_AT2_ANAGR_DEP_CAP ,  (const char*) anagr.curr().get((TString&) f3[i]) ) ; 
-				msk.set( FLD_AT2_DEP_ANAGR_COMUNI_DESCR ,  (const char*) rec.get(N_DENCOM) ) ; 
-				msk.set( FLD_AT2_DEP_ANAGR_COMUNI_PROV ,  (const char*) rec.get(N_PROV) ) ; 
-				break;
-			}
-		}
-	}	
-	return TRUE;
-}
-
-bool BA4500_application::user_create()
-{
-  _msk = new TMask("ba4500a") ;
-  // _msk->set_handler(LST_AT2_TIPOADS, gest_res);
-  _msk->set_handler(FLD_AT2_CODANGRDS, gest_res);
-  _rel = new TRelation(LF_ATTIV) ;
-  _anag = new TLocalisamfile(LF_ANAG) ;
-  _ditte = new TLocalisamfile(LF_NDITTE) ;
-	set_search_field(FLD_AT1_CODDITTAH);
-	return TRUE;
-}
-
-void BA4500_application::init_query_mode(TMask& m)
-
-{
-	m.show(FLD_AT1_CODATTH);
-	m.hide(FLD_AT1_CODATT);
-}
-
-
-void BA4500_application::init_query_insert_mode(TMask& m)
-
-{
-	m.show(FLD_AT1_CODATT);
-	m.hide(FLD_AT1_CODATTH);
-}
-
-
-bool BA4500_application::user_destroy()
-{
-  delete  _msk;
-  delete _rel;
-  delete _anag;
-  delete _ditte;
-	return TRUE;
-}
-
-int BA4500_application::read(TMask& m) 
-
-{
-	m.autoload();
-	m.field(FLD_AT2_CODANGRDS).set_focusdirty();
-	gest_res(m.field(FLD_AT2_CODANGRDS), K_TAB);
-	return NOERR;
-}
-
-int ba4500(int argc, char* argv[])
-{
-  
-  BA4500_application a;
-  a.run(argc, argv, "Anagrafica Attivita'");
-  return 0;
-}
-
-
+#include <relapp.h>
+#include <stdtypes.h>
+#include <lffiles.h>
+#include "ba4.h"
+#include "ba4500.h"
+
+class TAttivita_application : public TRelation_application
+{
+  TMask* _msk;
+  TRelation* _rel;
+  TLocalisamfile * _anag;
+  TLocalisamfile * _ditte;
+  TLocalisamfile * _comuni;
+
+  bool user_create() ;                         
+  bool user_destroy() ;                        
+  virtual TMask* get_mask(int mode) { return _msk;}
+  virtual bool changing_mask(int mode) { return FALSE;}
+  virtual TRelation* get_relation() const { return _rel;}
+  virtual int read(TMask& m);
+  virtual void init_query_mode(TMask& m) ;
+  virtual void init_query_insert_mode(TMask& m) ;
+  static bool gest_res(TMask_field& f, KEY key);
+
+
+public:
+  TAttivita_application() {}
+  virtual ~TAttivita_application() {}
+};
+HIDDEN inline TAttivita_application & app() { return (TAttivita_application &) main_app();}
+
+
+bool TAttivita_application::gest_res(TMask_field& f, KEY key)
+{
+
+  if (!f.to_check(key)) return TRUE;
+  
+  TMask &        msk = f.mask();
+  TLocalisamfile & anag = *app()._anag;
+  TLocalisamfile & comuni = *app()._comuni;
+
+  anag.setkey(1);
+  anag.zero();
+  anag.put(N_TIPOA, msk.get(LST_AT2_TIPOADS));
+  anag.put(N_CODANAGR, msk.get(FLD_AT2_CODANGRDS));
+  if (anag.read() != NOERR)
+    return FALSE;
+
+  TArray comarr(2), f1(2), f2(2), f3(2);
+  TString cod_com = anag.get(N_CODCOMRF);
+  
+  comarr.add(cod_com);
+  cod_com = anag.get(N_CODCOMRES);
+  comarr.add(cod_com);
+  cod_com = N_INDRF;
+  f1.add(cod_com);
+  cod_com = N_CIVRF;
+  f2.add(cod_com);
+  cod_com = N_CAPRF;
+  f3.add(cod_com);
+  cod_com = N_INDRES;
+  f1.add(cod_com);
+  cod_com = N_CIVRES;
+  f2.add(cod_com);
+  cod_com = N_CAPRES;
+  f3.add(cod_com);
+
+  for (int i = 0; i < comarr.items(); i++)
+  {
+    cod_com = (TString&) comarr[i];
+    if ( cod_com.not_empty() )
+    {
+      comuni.zero() ;
+      comuni.put(N_COM, cod_com );
+      comuni.setkey(1) ;
+      if (comuni.read() == NOERR)
+      {
+        msk.set( FLD_AT2_ANAGR_DEP_IND ,  (const char*) anag.get((TString&) f1[i]) ) ; 
+        msk.set( FLD_AT2_ANAGR_DEP_CIV ,  (const char*) anag.get((TString&) f2[i]) ) ; 
+        msk.set( FLD_AT2_ANAGR_DEP_CAP ,  (const char*) anag.get((TString&) f3[i]) ) ; 
+        msk.set( FLD_AT2_DEP_ANAGR_COMUNI_DESCR ,  (const char*) comuni.get(N_DENCOM) ) ; 
+        msk.set( FLD_AT2_DEP_ANAGR_COMUNI_PROV ,  (const char*) comuni.get(N_PROV) ) ; 
+        break;
+      }
+    }
+  }     
+  return TRUE;
+}
+
+bool TAttivita_application::user_create()
+{
+  _msk = new TMask("ba4500a") ;
+  _msk->set_handler(FLD_AT2_CODANGRDS, gest_res);
+  _rel = new TRelation(LF_ATTIV) ;
+  _anag = new TLocalisamfile(LF_ANAG) ;
+  _ditte = new TLocalisamfile(LF_NDITTE) ;
+  _comuni = new TLocalisamfile(LF_COMUNI) ;
+  set_search_field(FLD_AT1_CODDITTAH);
+  return TRUE;
+}
+
+void TAttivita_application::init_query_mode(TMask& m)
+
+{
+  m.show(FLD_AT1_CODATTH);
+  m.hide(FLD_AT1_CODATT);
+}
+
+
+void TAttivita_application::init_query_insert_mode(TMask& m)
+
+{
+  m.show(FLD_AT1_CODATT);
+  m.hide(FLD_AT1_CODATTH);
+}
+
+
+bool TAttivita_application::user_destroy()
+{
+  delete  _msk;
+  delete _rel;
+  delete _anag;
+  delete _ditte;
+  delete _comuni;
+  return TRUE;
+}
+
+int TAttivita_application::read(TMask& m) 
+
+{
+  m.autoload();
+  m.field(FLD_AT2_CODANGRDS).set_focusdirty();
+  gest_res(m.field(FLD_AT2_CODANGRDS), K_TAB);
+  return NOERR;
+}
+
+int ba4500(int argc, char* argv[])
+{
+  
+  TAttivita_application a;
+  a.run(argc, argv, "Anagrafica Attivita'");
+  return 0;
+}
+
+
diff --git a/ba/ba4500a.uml b/ba/ba4500a.uml
index 5f7b73b50..399410d2e 100755
--- a/ba/ba4500a.uml
+++ b/ba/ba4500a.uml
@@ -34,18 +34,18 @@ STRING FLD_AT1_CODDITTAH 5
 BEGIN
   FLAGS "HD"
   USE LF_ATTIV KEY 1
-//  JOIN LF_NDITTE TO LF_ATTIV INTO CODDITTA=CODDITTA
-// JOIN %AIS TO LF_ATTIV INTO CODTAB=CODATT
-  INPUT CODDITTA FLD_AT1_CODDITTA
+  KEY 1
+  INPUT CODDITTA FLD_AT1_CODDITTA SELECT
   INPUT CODATT FLD_AT1_CODATT
-  // DISPLAY "Codice" CODDITTA
-  // DISPLAY "Ditta@50" LF_NDITTE->RAGSOC
   DISPLAY "Attivita'" CODATT
   DISPLAY "Prevalente" ATTPREV
-//  DISPLAY " @50" %AIS->S0
   DISPLAY " @50" DESCR
-  OUTPUT FLD_AT1_CODDITTA CODDITTA
+  OUTPUT FLD_AT1_CODDITTAH CODDITTA
   OUTPUT FLD_AT1_CODATT CODATT
+  OUTPUT FLD_AT1_ATTCODATT_TABATT_DESCR DESCR
+  VALIDATE CHECK_FIELD FLD_AT1_CODDITTA
+  CHECKTYPE REQUIRED
+  WARNING "Ditta assente"
 END
 
 STRING FLD_AT1_PROGD_NDITTE_RAGSOC 50
@@ -67,38 +67,32 @@ STRING FLD_AT1_CODATTH 5
 BEGIN
   PROMPT 1 3 "Codice Attivita'"
   FIELD LF_ATTIV->CODATT
-  FLAGS "URZ"
+  FLAGS "UZ"
   KEY 1
-  COPY USE FLD_AT1_CODDITTAH
-  INPUT CODDITTA FLD_AT1_CODDITTA SELECT
-  INPUT CODATT FLD_AT1_CODATTH
-  COPY DISPLAY FLD_AT1_CODDITTAH
-  OUTPUT FLD_AT1_CODDITTA CODDITTA
-  OUTPUT FLD_AT1_CODATT CODATT
-  OUTPUT FLD_AT1_CODATTH CODATT
-  CHECKTYPE REQUIRED
+  COPY ALL FLD_AT1_CODDITTAH
   GROUP 3
-  MESSAGE COPY,FLD_AT1_CODATT|COPY,FLD_AT1_CODATTH  
+  VALIDATE CHECK_FIELD FLD_AT1_CODATT
+  MESSAGE COPY,FLD_AT1_CODATT
+  WARNING "Attivita' assente"
+  CHECKTYPE REQUIRED
 END
 
 STRING FLD_AT1_CODATT 5
 BEGIN
   PROMPT 1 3 "Codice Attivita'"
   FIELD LF_ATTIV->CODATT
-  FLAGS "URZG"
+  FLAGS "UZG"
   KEY 1
   USE %AIS
   INPUT CODTAB FLD_AT1_CODATT
   DISPLAY "Codice" CODTAB
   DISPLAY "Descrizione@50" S0
   OUTPUT FLD_AT1_CODATT CODTAB
-  OUTPUT FLD_AT1_CODATTH CODTAB
   OUTPUT FLD_AT1_ATTCODATT_TABATT_DESCR S0
-  HELP "Codice dell'attivita'"
   MESSAGE COPY,3@
   CHECKTYPE FORCED
+  HELP "Codice dell'attivita'"
   WARNING "Attivita' assente"
-  MESSAGE COPY,FLD_AT1_CODATTH 
 END
 
 BOOLEAN F_ATTPREV
@@ -114,6 +108,7 @@ BEGIN
   PROMPT 1 4 "Nome Attivita'  "
   FIELD LF_ATTIV->DESCR
   MESSAGE COPY,4@
+  KEY 1
   HELP "Nome dell'attivita'"
 END
 
@@ -125,7 +120,8 @@ BEGIN
   USE %OIS
   INPUT CODTAB[1,4] FLD_AT1_OLDCODATT
   INPUT CODTAB[5,] FLD_AT1_SUBCOD
-  DISPLAY "Codice" CODTAB
+  DISPLAY "Codice" CODTAB[1,4]
+  DISPLAY "Subcodice" CODTAB[5,]
   DISPLAY "Attivita'@50" S0
   OUTPUT FLD_AT1_OLDCODATT CODTAB[1,4]
   OUTPUT FLD_AT1_SUBCOD CODTAB[5,]
@@ -149,7 +145,15 @@ END
 STRING FLD_AT1_OLDCODATT_OLDATT_DESCR 50
 BEGIN
   PROMPT 1 7 "Nome            "
-  FLAGS "D"
+  USE %OIS KEY 2
+  INPUT S0 FLD_AT1_OLDCODATT_OLDATT_DESCR
+  DISPLAY "Attivita'@50" S0
+  DISPLAY "Codice" CODTAB[1,4]
+  DISPLAY "Subcodice" CODTAB[5,]
+  COPY OUTPUT FLD_AT1_OLDCODATT
+  HELP "Vecchio codice attivita'"
+  CHECKTYPE NORMAL
+  WARNING "Attivita' assente"
 END
 
 DATE FLD_AT1_DATAISCIVA
@@ -161,7 +165,7 @@ END
 
 DATE FLD_AT1_DATAVARIVA
 BEGIN
-  PROMPT 44 8 "Variazione   "
+  PROMPT 30 8 "Variazione "
   FIELD LF_ATTIV->DATAVARIVA
   HELP "Data di variazione dati IVA"
   WARNING "Data non corretta"
@@ -170,7 +174,7 @@ END
 
 DATE FLD_ATT_DCESSATT
 BEGIN
-  PROMPT 1 9 "Termine         "
+  PROMPT 56 8 "Termine "
   FIELD LF_ATTIV->DCESSATT
   HELP "Data del termine previsto attivita'"
   WARNING "Data non corretta"
@@ -179,11 +183,11 @@ END
 
 STRING FLD_AT1_CODULIVA11 3
 BEGIN
-  PROMPT 44 9 "Unita' Locale IVA 11 "
+  PROMPT 1 9 "Unita' Locale IVA 11 "
   FIELD LF_ATTIV->CODULIVA11
   FLAGS "R"
   USE LF_UNLOC KEY 1
-	JOIN LF_COMUNI TO LF_UNLOC KEY 1 INTO COM=COMULC
+  JOIN LF_COMUNI TO LF_UNLOC KEY 1 INTO COM=COMULC
   INPUT CODDITTA FLD_AT1_CODDITTA SELECT
   INPUT CODULC FLD_AT1_CODULIVA11
   DISPLAY "Un.Loc" CODULC
@@ -197,7 +201,7 @@ END
 
 LIST LST_AT1_TIPOATT 26
 BEGIN
-  PROMPT 1 10 "Tipo Attivita'  "
+  PROMPT 1 10 "Tipo Attivita'       "
   FIELD LF_ATTIV->TIPOATT
   HELP "Tipo di attivita'"
   ITEM " |Altre"
@@ -353,19 +357,16 @@ BEGIN
   FIELD LF_ATTIV->CODANGRDS
   FLAGS "R"
   USE LF_ANAG KEY 1
-// JOIN LF_COMUNI TO LF_ANAG KEY 1 INTO COM=COMRF
-  INPUT TIPOA LST_AT2_TIPOADS
+  INPUT TIPOA LST_AT2_TIPOADS SELECT
   INPUT CODANAGR FLD_AT2_CODANGRDS
   DISPLAY "Tipo" TIPOA
   DISPLAY "Codice" CODANAGR
-  DISPLAY "Nome                              " RAGSOC
-  OUTPUT LST_AT2_TIPOADS TIPOA
+  DISPLAY "Nome/Cognome o Ragione sociale @50" RAGSOC
   OUTPUT FLD_AT2_CODANGRDS CODANAGR
   OUTPUT FLD_AT2_CODANGRDS_ANAGR_RAGSOC RAGSOC
   OUTPUT FLD_AT2_ANAGR_DEP_IND INDRES
   OUTPUT FLD_AT2_ANAGR_DEP_CIV CIVRES
   OUTPUT FLD_AT2_ANAGR_DEP_CAP CAPRES
-// OUTPUT FLD_AT2_DEP_ANAGR_COMUNI_DESCR LF_COMUNI->DENCOM
   HELP "Codice del depositario dei registri"
   CHECKTYPE REQUIRED
   WARNING "Anagrafica assente"
@@ -375,7 +376,17 @@ END
 STRING FLD_AT2_CODANGRDS_ANAGR_RAGSOC 50
 BEGIN
   PROMPT 13 8 ": Nome "
-  FLAGS "D"
+  USE LF_ANAG KEY 2
+  INPUT TIPOA LST_AT2_TIPOADS SELECT
+  INPUT RAGSOC FLD_AT2_CODANGRDS_ANAGR_RAGSOC
+  DISPLAY "Nome/Cognome o Ragione sociale @50" RAGSOC
+  DISPLAY "Tipo" TIPOA
+  DISPLAY "Codice" CODANAGR
+  COPY OUTPUT FLD_AT2_CODANGRDS
+  HELP "Nome del depositario dei registri"
+  CHECKTYPE NORMAL
+  WARNING "Anagrafica assente"
+  ADD RUN ba4 -1
 END
 
 STRING FLD_AT2_ANAGR_DEP_IND 35
diff --git a/ba/ba4600.cpp b/ba/ba4600.cpp
index 5702e1b9a..548514c5b 100755
--- a/ba/ba4600.cpp
+++ b/ba/ba4600.cpp
@@ -4,64 +4,65 @@
 #include "ba4.h"
 #include "ba4600.h"
 
-class BA4600_application : public TRelation_application
+class TSoci_application : public TRelation_application
 {
-	TMask* _msk;
-	TRelation* _rel;
-	TLocalisamfile* _anag;
-	TLocalisamfile* _ditte;
+  TMask* _msk;
+  TRelation* _rel;
+  TLocalisamfile* _anag;
+  TLocalisamfile* _ditte;
 
-	bool user_create() ;                         
-	bool user_destroy() ;                        
-	virtual TMask* get_mask(int mode) { return _msk;}
-	virtual bool changing_mask(int mode) { return FALSE;}
-	virtual TRelation* get_relation() const { return _rel;}
+  bool user_create() ;                         
+  bool user_destroy() ;                        
+  virtual TMask* get_mask(int mode) { return _msk;}
+  virtual bool changing_mask(int mode) { return FALSE;}
+  virtual TRelation* get_relation() const { return _rel;}
 
 public:
-  BA4600_application() {}
-  virtual ~BA4600_application() {}
+  TSoci_application() {}
+  virtual ~TSoci_application() {}
   virtual void init_query_mode(TMask& m) ;
   virtual void init_query_insert_mode(TMask& m) ;
 };
 
-void BA4600_application::init_query_mode(TMask& m)
+void TSoci_application::init_query_mode(TMask& m)
 
 {
-	m.show(FLD_SC1_CODANAGRSOH);
-	m.hide(FLD_SC1_CODANAGRSO);
+  m.show(FLD_SC1_CODANAGRSOH);
+  m.hide(FLD_SC1_CODANAGRSO);
+  m.set(FLD_SC1_CODANAGR_ANAGR_RAGSOC, "");
 }
 
 
-void BA4600_application::init_query_insert_mode(TMask& m)
+void TSoci_application::init_query_insert_mode(TMask& m)
 
 {
-	m.show(FLD_SC1_CODANAGRSO);
-	m.hide(FLD_SC1_CODANAGRSOH);
+  m.show(FLD_SC1_CODANAGRSO);
+  m.hide(FLD_SC1_CODANAGRSOH);
+  m.set(FLD_SC1_CODANAGR_ANAGR_RAGSOC, "");
 }
 
-
-bool BA4600_application::user_create() 
+bool TSoci_application::user_create() 
 {
   _msk = new TMask("ba4600a") ;
-	_rel = new TRelation(LF_SOCI) ;
-	_anag = new TLocalisamfile(LF_ANAG) ;
-	_ditte = new TLocalisamfile(LF_NDITTE) ;
-	set_search_field(FLD_SC1_CODANAGRSOH);
-	return TRUE;
+  _rel = new TRelation(LF_SOCI) ;
+  _anag = new TLocalisamfile(LF_ANAG) ;
+  _ditte = new TLocalisamfile(LF_NDITTE) ;
+  set_search_field(FLD_SC1_CODANAGRSOH);
+  return TRUE;
 }
 
-bool BA4600_application::user_destroy() 
+bool TSoci_application::user_destroy() 
 {
   delete _msk;
-	delete _rel;
-	delete _anag;
-	delete _ditte;
-	return TRUE;
+  delete _rel;
+  delete _anag;
+  delete _ditte;
+  return TRUE;
 }
 
 int ba4600(int argc, char* argv[])
 {
-  BA4600_application a ;
+  TSoci_application a ;
   a.run(argc, argv, "Anagrafica Soci");
   return 0;
 }
diff --git a/ba/ba4600a.uml b/ba/ba4600a.uml
index 129076ddb..2c262977d 100755
--- a/ba/ba4600a.uml
+++ b/ba/ba4600a.uml
@@ -51,8 +51,24 @@ BEGIN
   FIELD LF_SOCI->ANNO
   FLAGS "A"
   KEY 1
+  USE LF_SOCI KEY 1
+  JOIN LF_ANAG TO LF_SOCI KEY 1 INTO TIPOA=TIPOASOC CODANAGR=CODANAGRSO
+  INPUT CODDITTA FLD_SC1_CODDITTA SELECT
+  INPUT TIPOASOC LST_SC1_TIPOASOC
+  INPUT CODANAGRSO FLD_SC1_CODANAGRSO
+  INPUT ANNO FLD_SC1_ANNO
+  DISPLAY "Tipo" TIPOASOC
+  DISPLAY "Codice" CODANAGRSO
+  DISPLAY "Ragione sociale@50" LF_ANAG->RAGSOC
+  DISPLAY "Anno" ANNO
+  DISPLAY "Quote@10" PERCQUAZ
+  OUTPUT FLD_SC1_CODDITTA CODDITTA
+  OUTPUT LST_SC1_TIPOASOC TIPOASOC
+  OUTPUT FLD_SC1_CODANAGRSOH CODANAGRSO
+  OUTPUT FLD_SC1_CODANAGR_ANAGR_RAGSOC LF_ANAG->RAGSOC
+  OUTPUT FLD_SC1_ANNO ANNO
   CHECKTYPE REQUIRED
-  WARNING "Inserire l'anno"
+  WARNING "Socio assente"
   MESSAGE COPY,7@
 END
 
@@ -75,26 +91,11 @@ BEGIN
   FIELD LF_SOCI->CODANAGRSO
   FLAGS "R"
   KEY 1
-  USE LF_SOCI KEY 1
-  JOIN LF_ANAG TO LF_SOCI KEY 1 INTO TIPOA=TIPOASOC CODANAGR=CODANAGRSO
-  INPUT CODDITTA FLD_SC1_CODDITTA SELECT
-  INPUT TIPOASOC LST_SC1_TIPOASOC
-  INPUT CODANAGRSO FLD_SC1_CODANAGRSO
-  INPUT ANNO FLD_SC1_ANNO
-  // DISPLAY "Ditta " CODDITTA
-  DISPLAY "Tipo" TIPOASOC
-  DISPLAY "Codice" CODANAGRSO
-  DISPLAY "Ragione sociale@50" LF_ANAG->RAGSOC
-  DISPLAY "Anno" ANNO
-  DISPLAY "Quote@10" PERCQUAZ
-  OUTPUT FLD_SC1_CODDITTA CODDITTA
-  OUTPUT LST_SC1_TIPOASOC TIPOASOC
-  OUTPUT FLD_SC1_CODANAGRSOH CODANAGRSO
-  OUTPUT FLD_SC1_CODANAGR_ANAGR_RAGSOC LF_ANAG->RAGSOC
-  OUTPUT FLD_SC1_ANNO ANNO
+  COPY ALL FLD_SC1_ANNO
+  VALIDATE CHECK_FIELD FLD_SC1_CODANAGRSO
   CHECKTYPE REQUIRED
   MESSAGE COPY,FLD_SC1_CODANAGRSO|COPY,5@
-  GROUP 8
+  WARNING "Socio assente"
 END
 
 NUMBER FLD_SC1_CODANAGRSO 5
@@ -113,10 +114,9 @@ BEGIN
   OUTPUT FLD_SC1_CODANAGRSO CODANAGR
   OUTPUT FLD_SC1_CODANAGR_ANAGR_RAGSOC RAGSOC
   HELP "Codice dell'anagrafica del socio"
-  MESSAGE COPY,5@|COPY,8@
+  MESSAGE COPY,FLD_SC1_CODANAGRSOH|COPY,5@
   CHECKTYPE FORCED
-  WARNING "Anagrafica assente o nulla"
-  MESSAGE COPY,FLD_SC1_CODANAGRSOH
+  WARNING "Anagrafica assente"
 END
 
 STRING FLD_SC1_CODANAGR_ANAGR_RAGSOC 50
@@ -125,7 +125,7 @@ BEGIN
   HELP "Nome dell'anagrafica del socio"
   KEY 1
   USE LF_ANAG KEY 2
-  FLAGS "G"
+  FLAGS "GP"
   INPUT TIPOA LST_SC1_TIPOASOC
   INPUT RAGSOC FLD_SC1_CODANAGR_ANAGR_RAGSOC
   DISPLAY "Ragione Sociale@50" RAGSOC
@@ -141,7 +141,7 @@ STRING FLD_SC1_CODCAR 2
 BEGIN
   PROMPT 1 7 "Codice carica   "
   FIELD LF_SOCI->CODCAR
-  FLAGS "RZ"
+  FLAGS "Z"
   USE %CRS
   INPUT CODTAB FLD_SC1_CODCAR
   DISPLAY "Codice" CODTAB
@@ -302,43 +302,39 @@ END
 
 LIST DLG_NULL 9
 BEGIN
-  PROMPT 1 3 "Socio : Tipo    "
+  PROMPT 1 4 "Socio : Tipo    "
   FLAGS "D"
   ITEM "F|Fisica"
   ITEM "G|Giuridica"
   GROUP 4
 END
 
+NUMBER DLG_NULL 4
+BEGIN
+  PROMPT 1 3 "Anno            "
+  FLAGS "AD"
+  GROUP 7
+END
+
 NUMBER DLG_NULL 5
 BEGIN
-  PROMPT 30 3 "Codice "
+  PROMPT 30 4 "Codice "
   FLAGS "RD"
   GROUP 5
 END
 
 STRING DLG_NULL 50
 BEGIN
-  PROMPT 7 4 ": Nome    "
+  PROMPT 7 5 ": Nome    "
   FLAGS "D"
   GROUP 6
 END
 
-NUMBER DLG_NULL 4
-BEGIN
-  PROMPT 1 5 "Anno            "
-  FLAGS "AD"
-  GROUP 7
-END
-
 BOOLEAN CHK_SC1_PARTASS
 BEGIN
   PROMPT 1 7 "Partecipazione assemblea"
   FIELD LF_SOCI->PARTASS
   HELP "Indicare se il socio partecipa alle assemblee sociali"
-  MESSAGE FALSE DISABLE,FLD_SC1_PARTECDAL|RESET,FLD_SC1_PARTECDAL
-  MESSAGE FALSE DISABLE,FLD_SC2_PARTECAL|RESET,FLD_SC2_PARTECAL
-  MESSAGE TRUE ENABLE,FLD_SC1_PARTECDAL
-  MESSAGE TRUE ENABLE,FLD_SC2_PARTECAL
 END
 
 GROUPBOX DLG_NULL 26 4
@@ -371,7 +367,6 @@ BEGIN
   ITEM "A1|Quadro A1"
   ITEM "B|Quadro B"
   ITEM "D|Quadro D"
-  ITEM "D1|Quadro D1"
 END
 
 LIST LST_SC2_Q740 10
@@ -380,7 +375,7 @@ BEGIN
   FIELD LF_SOCI->Q740
   HELP "Quadro in cui compare il socio sul modello 740"
   ITEM " |Nessuno"
-  ITEM "A|Quadro A"
+  ITEM "A1|Quadro A1"
   ITEM "F|Quadro F"
   ITEM "G|Quadro G"
   ITEM "H|Quadro H"
@@ -428,7 +423,7 @@ BEGIN
   INPUT TIPOA "F"
   INPUT CODANAGR FLD_SC2_CODANAGCON
   DISPLAY "Codice" CODANAGR
-  DISPLAY "Nome                                        " RAGSOC
+  DISPLAY "Nome@50" RAGSOC
   OUTPUT FLD_SC2_CODANAGCON CODANAGR
   OUTPUT FLD_SC2_CODANAGCON_ANAFIS_RAGSOC RAGSOC
   HELP "Codice anagrafico del coniuge"
@@ -444,7 +439,7 @@ BEGIN
   USE LF_ANAG KEY 2
 	INPUT TIPOA "F"
   INPUT RAGSOC FLD_SC2_CODANAGCON_ANAFIS_RAGSOC
-  DISPLAY "Nome                                        " RAGSOC
+  DISPLAY "Nome@50" RAGSOC
   DISPLAY "Codice" CODANAGR
   OUTPUT FLD_SC2_CODANAGCON CODANAGR
   OUTPUT FLD_SC2_CODANAGCON_ANAFIS_RAGSOC RAGSOC
diff --git a/ba/ba6100.cpp b/ba/ba6100.cpp
index 0c80bcda5..e5ea4185f 100755
--- a/ba/ba6100.cpp
+++ b/ba/ba6100.cpp
@@ -185,7 +185,7 @@ void BA6100_App::preprocess_etichette()
   case domfisc:
     _address = get_field(LF_ANAG,"INDRF");
     _civ     = get_field(LF_ANAG,"CIVRF");
-    _stato   = look_tab("%STA",get_field(LF_ANAG,"STATORF"));
+    _stato   = "" ; // look_tab("%STA",get_field(LF_ANAG,"STATORF"));
     _cap     = get_field(LF_ANAG,"CAPRF");
     cc      = look_com(get_field(LF_ANAG,"COMRF"));
     _com     = cc.get("DENCOM");
@@ -198,9 +198,9 @@ void BA6100_App::preprocess_etichette()
   case residenza:
     _address = get_field(LF_ANAG,"INDRES");
     _civ     = get_field(LF_ANAG,"CIVRES");
-    _stato   = look_tab("%STA",get_field(LF_ANAG,"STATORES"));
+    _stato   = ""; //look_tab("%STA",get_field(LF_ANAG,"STATORES"));
     _cap     = get_field(LF_ANAG,"CAPRES");
-    cc      = look_com(get_field(LF_ANAG,"COMRES"));
+    cc       = look_com(get_field(LF_ANAG,"COMRES"));
     _com     = cc.get("DENCOM");
     _prov    = cc.get("PROVCOM");
     if (_cap.empty())
@@ -522,11 +522,6 @@ bool BA6100_App::user_create()
   set_translation(LF_NDITTE,"DATLAV","1","Si");
   set_translation(LF_NDITTE,"DATLAV","2","No");
   set_translation(LF_NDITTE,"DATLAV","3","Lavoro Agricolo");
-  set_translation(LF_NDITTE,"STATOSOC","1","Normale attivita'");
-  set_translation(LF_NDITTE,"STATOSOC","2","Liquidazione cessata attivita'");
-  set_translation(LF_NDITTE,"STATOSOC","3",
-                  "Fallimento o Liquidazione coatta amm.");
-  set_translation(LF_NDITTE,"STATOSOC","4","Estinto");
   set_translation(LF_ANAGGIU,"STATOSOC","1","Normale attivita'");
   set_translation(LF_ANAGGIU,"STATOSOC","2","Liquidazione cessata attivita'");
   set_translation(LF_ANAGGIU,"STATOSOC","3",
diff --git a/ba/batbcrs.uml b/ba/batbcrs.uml
index b918347f9..0ec68e1d3 100755
--- a/ba/batbcrs.uml
+++ b/ba/batbcrs.uml
@@ -1,50 +1,51 @@
-#include "batbcrs.h"
-
-TOOLBAR "" 0 20 0 2
-
-#include <toolbar.h>
-
-ENDPAGE
-
-PAGE "Cariche sociali" -1 -1 78 7
-
-STRING FLD_TABCRS_CODTAB 2
-BEGIN
-  PROMPT 3 1 "Codice    "
-  HELP "Codice della carica sociale"
-  FIELD LF_TABCOM->CODTAB
-  KEY 1
-  USE %CRS
-  INPUT CODTAB FLD_TABCRS_CODTAB
-  DISPLAY "Codice" CODTAB
-  DISPLAY "Carica@25" S0
-  OUTPUT FLD_TABCRS_CODTAB CODTAB
-  OUTPUT FLD_TABCRS_S0 S0
-  CHECKTYPE REQUIRED
-END
-
-STRING FLD_TABCRS_S0 25
-BEGIN
-  PROMPT 3 3 "Carica    "
-  FIELD LF_TABCOM->S0
-  KEY 2
-  USE %CRS KEY 2
-  INPUT S0 FLD_TABCRS_S0
-  DISPLAY "Carica@25" S0
-  DISPLAY "Codice" CODTAB
-  OUTPUT FLD_TABCRS_CODTAB CODTAB
-  OUTPUT FLD_TABCRS_S0 S0
-  HELP "Descrizione della carica sociale"
-  CHECKTYPE REQUIRED
-END
-
-BOOLEAN CHK_TABCRS_S6
-BEGIN
-  PROMPT 3 5 "Stampa modulo RAD"
-  FIELD LF_TABCOM->S6
-  HELP "Indicare se la carica viene stampata su modulo RAD"
-END
-
-ENDPAGE
-
-ENDMASK
+#include "batbcrs.h"
+
+TOOLBAR "" 0 20 0 2
+
+#include <toolbar.h>
+
+ENDPAGE
+
+PAGE "Cariche sociali" -1 -1 78 7
+
+STRING FLD_TABCRS_CODTAB 2
+BEGIN
+  PROMPT 3 1 "Codice    "
+  HELP "Codice della carica sociale"
+  FIELD LF_TABCOM->CODTAB
+  KEY 1
+  USE %CRS
+  INPUT CODTAB FLD_TABCRS_CODTAB
+  DISPLAY "Codice" CODTAB
+  DISPLAY "Carica@25" S0
+  OUTPUT FLD_TABCRS_CODTAB CODTAB
+  OUTPUT FLD_TABCRS_S0 S0
+  CHECKTYPE REQUIRED
+  FLAGS "Z" 
+END
+
+STRING FLD_TABCRS_S0 25
+BEGIN
+  PROMPT 3 3 "Carica    "
+  FIELD LF_TABCOM->S0
+  KEY 2
+  USE %CRS KEY 2
+  INPUT S0 FLD_TABCRS_S0
+  DISPLAY "Carica@25" S0
+  DISPLAY "Codice" CODTAB
+  OUTPUT FLD_TABCRS_CODTAB CODTAB
+  OUTPUT FLD_TABCRS_S0 S0
+  HELP "Descrizione della carica sociale"
+  CHECKTYPE REQUIRED
+END
+
+BOOLEAN CHK_TABCRS_S6
+BEGIN
+  PROMPT 3 5 "Stampa modulo RAD"
+  FIELD LF_TABCOM->S6
+  HELP "Indicare se la carica viene stampata su modulo RAD"
+END
+
+ENDPAGE
+
+ENDMASK
diff --git a/ba/batbreg.h b/ba/batbreg.h
index fd1802d6d..07e98d9bf 100755
--- a/ba/batbreg.h
+++ b/ba/batbreg.h
@@ -1,47 +1,48 @@
-
-
-//      campi maschera batbreg.msk
-
-#define F_CODICE                            131
-#define F_ANNO                              132
-#define F_DESCR                             133
-#define F_CODLIB                            134
-#define F_TIPO                              135
-#define F_CONSPRESSO                        136
-#define F_PAGSTAMP                          137
-#define F_PAGNUM                            138
-#define F_DATAVID                           139
-#define F_DATASCAD                          140
-#define F_REGSOSP                           141
-#define F_CODDITTA                          142
-#define F_ATTIVITA                          143
-#define F_CORRISP                           144
-
-#define F_STAMPA_SULLO_STESSO_REGISTRO      145
-#define F_ULTIMO_NUM_RIGA_STAMPATO          146
-#define F_PROG_DARE                         147
-#define F_PROG_AVERE                        148
-
-#define F_STAMPA_RIEPIL_SUL_REGISTRO  149
-#define F_STAMPA_LIQUIDAZIONE         150
-#define F_ULTIMO_NUM_PROT             151
-#define F_MESE_STAMPA_ULTIMA_LIQ      152
-#define F_ULTIMA_DATA_DI_REGISTR      153
-
-#define F_VENTIL      154
-#define F_STAMPA_CREDITO_ANNO_PREC 155
-#define F_STAMPA_INDIRIZZI_COMPLETI 156
-#define F_STAMPA_INTESTAZIONE       157
-
-#define F_FREQUENZA_STAMPA 158
-
-#define F_STAMPA_COSTI_RICAVI 159
-#define F_TIPO_DESC_COSTI_RICAVI 160
-
-#define F_TOT_INCASSI 161
-#define F_TOT_PAGAMENTI 162
-
-#define F_ULTIMA_DATA_DI_STAMPA      154
-
+
+
+//      campi maschera batbreg.msk
+
+#define F_CODICE                            131
+#define F_ANNO                              132
+#define F_DESCR                             133
+#define F_CODLIB                            134
+#define F_TIPO                              135
+#define F_CONSPRESSO                        136
+#define F_PAGSTAMP                          137
+#define F_PAGNUM                            138
+#define F_DATAVID                           139
+#define F_DATASCAD                          140
+#define F_REGSOSP                           141
+#define F_CODDITTA                          142
+#define F_ATTIVITA                          143
+#define F_CORRISP                           144
+
+#define F_STAMPA_SULLO_STESSO_REGISTRO      145
+#define F_ULTIMO_NUM_RIGA_STAMPATO          146
+#define F_PROG_DARE                         147
+#define F_PROG_AVERE                        148
+
+#define F_STAMPA_RIEPIL_SUL_REGISTRO  149
+#define F_STAMPA_LIQUIDAZIONE         150
+#define F_ULTIMO_NUM_PROT             151
+#define F_MESE_STAMPA_ULTIMA_LIQ      152
+#define F_ULTIMA_DATA_DI_REGISTR      153
+
+#define F_VENTIL      154
+#define F_STAMPA_CREDITO_ANNO_PREC 155
+#define F_STAMPA_INDIRIZZI_COMPLETI 156
+#define F_STAMPA_INTESTAZIONE       157
+
+#define F_FREQUENZA_STAMPA 158
+
+#define F_STAMPA_COSTI_RICAVI 159
+#define F_TIPO_DESC_COSTI_RICAVI 160
+
+#define F_TOT_INCASSI 161
+#define F_TOT_PAGAMENTI 162
+
+#define F_ULTIMA_DATA_DI_STAMPA      154
+
 #define F_CODULC 163
 #define F_CODLBU  164
+#define F_RAGSOC 165
diff --git a/ba/batbreg.uml b/ba/batbreg.uml
index 350c00c63..722d8c8d4 100755
--- a/ba/batbreg.uml
+++ b/ba/batbreg.uml
@@ -11,16 +11,28 @@ PAGE "Registri" -1 -1 78 18
 
 NUMBER F_CODDITTA 5
 BEGIN
-  FLAGS "FRH"
+  PROMPT 1 1 "Ditta       "
+  FLAGS "FRDG"
   USE LF_NDITTE
   INPUT CODDITTA F_CODDITTA
+  OUTPUT F_RAGSOC RAGSOC
   OUTPUT F_ATTIVITA CODATTPREV
   CHECKTYPE NORMAL
+  MESSAGE COPY,18@
+  MESSAGE FALSE COPY,18@
+END
+
+STRING F_RAGSOC 50
+BEGIN
+  PROMPT 20 1 ""
+  FLAGS "DG"
+  MESSAGE COPY,19@
+  MESSAGE FALSE COPY,19@
 END
 
 NUMBER F_ANNO 4
 BEGIN
-  PROMPT 4 1 "Anno              "
+  PROMPT 1 2 "Anno        "
   HELP "Anno a cui fa riferimento il registro"
   FIELD CODTAB[1,4]
   FLAGS "AZ"
@@ -43,7 +55,7 @@ END
 
 STRING F_CODICE 3
 BEGIN
-  PROMPT 51 1 "Codice registro   "
+  PROMPT 49 2 "Codice registro   "
   Help "Codice del registro"
   FIELD CODTAB[5,7]
   FLAGS "U"
@@ -56,8 +68,7 @@ END
 
 STRING F_DESCR 50
 BEGIN
-  PROMPT 4 3 "Descrizione       "
-  HELP "Descrizione del registro"
+  PROMPT 1 3 "Descrizione        "
   FIELD S0
   KEY 2
   GROUP 1
@@ -70,12 +81,13 @@ BEGIN
   COPY OUTPUT F_ANNO
   CHECKTYPE REQUIRED 
   MESSAGE COPY,22@
+  HELP "Descrizione del registro"
   WARNING "La descrizione e' obbligatoria"
 END 
 
 STRING F_CODLIB 2
 BEGIN
-  PROMPT 4 5 "Codice libro      "
+  PROMPT 1 5 "Codice libro      "
   FIELD S7
   FLAGS "R"
   GROUP 1
@@ -91,7 +103,7 @@ END
 
 LIST F_TIPO 26
 BEGIN
-  PROMPT 29 5 "Tipo "
+  PROMPT 30 5 "Tipo "
   HELP "Tipo di registro"
   FIELD I0
   FLAGS "G"
@@ -118,7 +130,7 @@ END
 
 STRING F_CONSPRESSO 40
 BEGIN
-  PROMPT 4 7 "Conservato presso "
+  PROMPT 1 7 "Conservato presso "
   HELP "Luogo dove verra' conservato il registro"
   FIELD S1
   GROUP 1
@@ -126,7 +138,7 @@ END
 
 STRING F_ATTIVITA 5
 BEGIN
-  PROMPT 4 9 "Codice attivita   "
+  PROMPT 1 9 "Codice attivita   "
   FIELD REG->S8
   FLAGS "URZ"
   GROUP 2 3 4
@@ -143,7 +155,7 @@ END
 
 NUMBER F_CODULC 3
 BEGIN
-  PROMPT 35 9 "Unita' locale         "
+  PROMPT 35 9 "Unita' locale           "
   FLAGS "R"
   GROUP 2 3 4 5 6 7 10
   FIELD I7
@@ -164,7 +176,7 @@ END
  
 NUMBER F_PAGSTAMP 5
 BEGIN
-  PROMPT 4 11 "Pagine stampate   "
+  PROMPT 1 11 "Pagine stampate   "
   HELP "Numero di pagine gia' stampate"
   FIELD I1
   FLAGS "R"
@@ -182,7 +194,7 @@ END
 
 DATE F_DATAVID
 BEGIN
-  PROMPT 4 13 "Data vidimazione  "
+  PROMPT 1 13 "Data vidimazione  "
   HELP "Data di vidimazione del registro"
   FIELD D0
   GROUP 1
@@ -198,7 +210,7 @@ END
 
 STRING F_CODLBU 3
 BEGIN
-  PROMPT 4 15 "Cod. libro unico  "
+  PROMPT 1 15 "Cod. libro unico  "
   HELP "Codice del libro unico a cui fa riferimento"
   GROUP 2 3 4
   FIELD S6
@@ -219,30 +231,44 @@ ENDPAGE
 
 PAGE "Registri pag.2" -1 -1 78 18
 
+NUMBER DLG_NULL 5
+BEGIN
+  PROMPT 1 1 "Ditta       "
+  FLAGS "DR"
+  GROUP 18
+END
+
+STRING DLG_NULL 50
+BEGIN
+  PROMPT 20 1 ""
+  FLAGS "D"
+  GROUP 19
+END
+
 NUMBER DLG_NULL 4
 BEGIN
-  PROMPT 4 1 "Anno              "
+  PROMPT 1 2 "Anno        "
   FLAGS "DP"
   GROUP 20
 END
 
 STRING DLG_NULL 3
 BEGIN
-  PROMPT 51 1 "Codice registro   "
+  PROMPT 49 2 "Codice registro   "
   FLAGS "D"
   GROUP 21
 END
 
 STRING DLG_NULL 50
 BEGIN
-  PROMPT 4 3 "Descrizione       "
+  PROMPT 1 3 "Descrizione        "
   GROUP 22
   FLAGS "D"
 END 
 
 BOOLEAN F_REGSOSP
 BEGIN
-  PROMPT 2 5 "Registro in sospensione "
+  PROMPT 1 5 "Registro in sospensione "
   FIELD B1
   GROUP 2 3
   HELP "Indicare se il registro e' in sospensione d'imposta"
@@ -266,7 +292,7 @@ END
 
 LIST F_TIPO_DESC_COSTI_RICAVI 1 10
 BEGIN
-  PROMPT 2 5 "Tipo descrizione costi/ricavi "
+  PROMPT 1 5 "Tipo descrizione costi/ricavi "
   HELP "Livello a cui stampare la descrizione costi/ricavi"
   FIELD I3
   GROUP 5
@@ -276,7 +302,7 @@ END
 
 NUMBER F_ULTIMO_NUM_RIGA_STAMPATO 7
 BEGIN
-  PROMPT 44 5 "Ultimo numero riga stamp."
+  PROMPT 1 5 "Ultima riga stampata "
   FIELD I6
   HELP "Ultimo numero della riga stampata"
   FLAGS "R"
@@ -285,15 +311,25 @@ END
 
 BOOLEAN F_STAMPA_INDIRIZZI_COMPLETI
 BEGIN
-  PROMPT 2 7 "Stampa indirizzi completi"
+  PROMPT 1 7 "Stampa indirizzi completi"
   HELP "Indicare se stampare gli indirizzi completi"
   FIELD B5
   GROUP 2 3
 END
 
+LIST F_FREQUENZA_STAMPA 1 16
+BEGIN
+  PROMPT 1 7 "Stampa registro riepilogativo   "
+  HELP "Intervallo per fare il riepilogo"
+  FIELD S9
+  GROUP 4
+  ITEM "M|Mensile"
+  ITEM "T|Trimestrale"
+END
+
 NUMBER F_PROG_DARE 15
 BEGIN
-  PROMPT 2 7 "Progressivo dare    "
+  PROMPT 1 7 "Progressivo dare     "
   HELP "Progressivo dare del giornale"
   FIELD R1
   PICTURE "."
@@ -303,7 +339,7 @@ END
 
 NUMBER F_TOT_INCASSI 15
 BEGIN
-  PROMPT 2 7 "Totale incassi "
+  PROMPT 1 7 "Totale incassi "
   HELP "Progressivo degli incassi effettuati"
   FIELD R0                      
   FLAGS "R"
@@ -333,7 +369,7 @@ END
 		 
 BOOLEAN F_STAMPA_LIQUIDAZIONE
 BEGIN
-  PROMPT 2 9 "Stampa liquidazione"
+  PROMPT 1 9 "Stampa liquidazione"
   FIELD B7
   GROUP 2 3 4
   HELP "Indicare se stampare a fine periodo la liquidazione"
@@ -341,7 +377,7 @@ END
 
 NUMBER F_PROG_AVERE 15
 BEGIN
-  PROMPT 2 9 "Progressivo avere   "
+  PROMPT 1 9 "Progressivo avere    "
   HELP "Progressivo avere del giornale"
   FIELD R2           
   FLAGS "R"
@@ -356,16 +392,6 @@ BEGIN
   GROUP 5
 END
 	     
-LIST F_FREQUENZA_STAMPA 1 16
-BEGIN
-  PROMPT 42 9 "Stampa reg.riepilogativo "
-  HELP "Intervallo per fare il riepilogo"
-  FIELD S9
-  GROUP 4
-  ITEM "M|Mensile"
-  ITEM "T|Trimestrale"
-END
-
 BOOLEAN F_VENTIL
 BEGIN
   PROMPT 46 9 "Attivita' con ventilazione"
@@ -374,17 +400,9 @@ BEGIN
   GROUP 3
 END
 
-BOOLEAN F_STAMPA_SULLO_STESSO_REGISTRO
-BEGIN
-  PROMPT 42 9 "Stampa sullo stesso registro"
-  HELP "Indicare se il nuovo esercizio viene stampato sullo stesso registro"
-  FIELD B8
-  GROUP 6
-END
-
 LIST F_MESE_STAMPA_ULTIMA_LIQ 10
 BEGIN
-  PROMPT 2 11 "Mese stampa ultima liquidaz. "
+  PROMPT 1 11 "Mese stampa ultima liquidazione "
   HELP "Mese in cui e' stata stampata l'ultima liquidazione"
   FIELD I4
   FLAGS "M"
@@ -393,26 +411,26 @@ BEGIN
   GROUP 2 3 4
 END
 
+BOOLEAN F_STAMPA_SULLO_STESSO_REGISTRO
+BEGIN
+  PROMPT 1 11 "Stampa sullo stesso registro"
+  HELP "Indicare se il nuovo esercizio viene stampato sullo stesso registro"
+  FIELD B8
+  GROUP 6
+END
+
 NUMBER F_ULTIMO_NUM_PROT 7
 BEGIN
-  PROMPT 2 13 "Ultimo numero di protocollo     "
+  PROMPT 1 13 "Ultimo numero di protocollo     "
   FIELD I5
   FLAGS "R"
   GROUP 2 3
   HELP "Ultimo numero di protocollo"
 END
 
-BOOLEAN F_STAMPA_INTESTAZIONE
-BEGIN
-  PROMPT 46 13 "Stampa intestazione ditta"
-  HELP "Indicare se stampare l'intestazione della ditta"
-  FIELD B9
-  GROUP 1
-END
-
 DATE F_ULTIMA_DATA_DI_REGISTR
 BEGIN
-  PROMPT 2 15 "Ultima data di registrazione    "
+  PROMPT 1 15 "Ultima data di registrazione    "
   HELP "Date dell'ultima registrazione stampata"
   FIELD D2
   GROUP 2 3 5 6
@@ -420,11 +438,20 @@ END
 
 DATE F_ULTIMA_DATA_DI_STAMPA
 BEGIN
-  PROMPT 2 17 "Ultima data di stampa           "
+  PROMPT 1 17 "Ultima data di stampa           "
   HELP "Data dell'ultima stampa effettuata"
   FIELD D3
 END
 
+BOOLEAN F_STAMPA_INTESTAZIONE
+BEGIN
+  PROMPT 46 17 "Stampa intestazione ditta"
+  HELP "Indicare se stampare l'intestazione della ditta"
+  FIELD B9
+  GROUP 1
+END
+
 ENDPAGE
 
 ENDMASK
+
diff --git a/ba/batbsta.h b/ba/batbsta.h
index 8ba78eb03..b4505f35b 100755
--- a/ba/batbsta.h
+++ b/ba/batbsta.h
@@ -1,7 +1,6 @@
 #define FLD_TABSTA_CODTAB 100
 #define FLD_TABSTA_S0 101
-#define CHK_TABSTA_S6 102
-#define FLD_TABSTA_S7 103
-#define FLD_TABSTA_S7_TABVAL_S0 104
-#define FLD_TABSTA_S2 108
-#define DLG_DEL 107
+#define FLD_TABSTA_S7 102
+#define FLD_TABSTA_S7_TABVAL_S0 103
+#define FLD_TABSTA_S2 104
+#define DLG_DEL 105
diff --git a/ba/batbsta.uml b/ba/batbsta.uml
index 0fcee39c3..cc33fecf2 100755
--- a/ba/batbsta.uml
+++ b/ba/batbsta.uml
@@ -1,92 +1,72 @@
-#include "batbsta.h"
-
-TOOLBAR "" 0 20 0 2
-
-#include <toolbar.h>
-
-ENDPAGE
-
-PAGE "Stati esteri" -1 -1 78 13
-
-STRING FLD_TABSTA_CODTAB 3
-BEGIN
-  PROMPT 3 1 "Codice        "
-  FIELD %STA->CODTAB
-  FLAGS "RZ"
-  KEY 1
-  USE %STA
-  INPUT CODTAB FLD_TABSTA_CODTAB
-  DISPLAY "Codice" CODTAB
-  DISPLAY "Denominazione@50" S0
-  OUTPUT FLD_TABSTA_CODTAB CODTAB
-  OUTPUT FLD_TABSTA_S0 S0
-  HELP "Codice dello stato"
-  CHECKTYPE REQUIRED
-END
-
-STRING FLD_TABSTA_S0 50
-BEGIN
-  PROMPT 3 3 "Denominazione "
-  FIELD %STA->S0
-  KEY 2
-  USE %STA KEY 2
-  INPUT S0 FLD_TABSTA_S0
-  DISPLAY "Denominazione@50" S0
-  DISPLAY "Codice" CODTAB
-  OUTPUT FLD_TABSTA_CODTAB CODTAB
-  OUTPUT FLD_TABSTA_S0 S0
-  HELP "Nome dello stato"
-  CHECKTYPE REQUIRED
-END
-
-LIST CHK_TABSTA_S6 18
-BEGIN
-  PROMPT 3 5 "Stato CEE     "
-  FIELD %STA->S6
-  HELP "Indicare il codice ISO dello stato"
-  ITEM "  |Italia o extra CEE"
-  ITEM "BE|Belgio"
-  ITEM "DE|Germania"
-  ITEM "DK|Danimarca"
-  ITEM "EL|Grecia"
-  ITEM "ES|Spagna"
-  ITEM "FR|Francia"
-  ITEM "GB|Gran Bretagna"
-  ITEM "IE|Irlanda"
-  ITEM "IT|Italia"
-  ITEM "LU|Lussemburgo"
-  ITEM "NL|Olanda"
-  ITEM "PT|Portogallo"
-END
-
-STRING FLD_TABSTA_S7 3
-BEGIN
-  PROMPT 3 7 "Valuta        "
-  FIELD %STA->S7
-  FLAGS "U"
-  USE %VAL
-	CHECKTYPE NORMAL
-  INPUT CODTAB FLD_TABSTA_S7
-  DISPLAY "Codice" CODTAB
-  DISPLAY "Valuta                " S0
-  OUTPUT FLD_TABSTA_S7 CODTAB
-  OUTPUT FLD_TABSTA_S7_TABVAL_S0 S0
-  HELP "Valuta corrente dello stato"
-END
-
-STRING FLD_TABSTA_S7_TABVAL_S0 50
-BEGIN
-  PROMPT 17 8 ""
-  FLAGS "D"
-END
-
-STRING FLD_TABSTA_S2 10
-BEGIN
-  PROMPT 3 10 "Nazionalit…   "
-  FIELD %STA->S2
-  HELP "Nazionalit… corrispondente a questo stato"
-END
-
-ENDPAGE
-
-ENDMASK
+#include "batbsta.h"
+
+TOOLBAR "" 0 20 0 2
+
+#include <toolbar.h>
+
+ENDPAGE
+
+PAGE "Stati esteri" -1 -1 78 13
+
+STRING FLD_TABSTA_CODTAB 3
+BEGIN
+  PROMPT 3 1 "Codice        "
+  FIELD %STA->CODTAB
+  FLAGS "RZ"
+  KEY 1
+  USE %STA
+  INPUT CODTAB FLD_TABSTA_CODTAB
+  DISPLAY "Codice" CODTAB
+  DISPLAY "Denominazione@50" S0
+  OUTPUT FLD_TABSTA_CODTAB CODTAB
+  OUTPUT FLD_TABSTA_S0 S0
+  HELP "Codice dello stato"
+  CHECKTYPE REQUIRED
+END
+
+STRING FLD_TABSTA_S0 50
+BEGIN
+  PROMPT 3 3 "Denominazione "
+  FIELD %STA->S0
+  KEY 2
+  USE %STA KEY 2
+  INPUT S0 FLD_TABSTA_S0
+  DISPLAY "Denominazione@50" S0
+  DISPLAY "Codice" CODTAB
+  OUTPUT FLD_TABSTA_CODTAB CODTAB
+  OUTPUT FLD_TABSTA_S0 S0
+  HELP "Nome dello stato"
+  CHECKTYPE REQUIRED
+END
+
+STRING FLD_TABSTA_S7 3
+BEGIN
+  PROMPT 3 5 "Valuta        "
+  FIELD %STA->S7
+  FLAGS "U"
+  USE %VAL
+	CHECKTYPE NORMAL
+  INPUT CODTAB FLD_TABSTA_S7
+  DISPLAY "Codice" CODTAB
+  DISPLAY "Valuta                " S0
+  OUTPUT FLD_TABSTA_S7 CODTAB
+  OUTPUT FLD_TABSTA_S7_TABVAL_S0 S0
+  HELP "Valuta corrente dello stato"
+END
+
+STRING FLD_TABSTA_S7_TABVAL_S0 50
+BEGIN
+  PROMPT 17 7 ""
+  FLAGS "D"
+END
+
+STRING FLD_TABSTA_S2 10
+BEGIN
+  PROMPT 3 9 "Nazionalita'  "
+  FIELD %STA->S2
+  HELP "Nazionalita' corrispondente a questo stato"
+END
+
+ENDPAGE
+
+ENDMASK
diff --git a/ba/batbuid.uml b/ba/batbuid.uml
index 73f0d80a4..ba5d81f84 100755
--- a/ba/batbuid.uml
+++ b/ba/batbuid.uml
@@ -6,7 +6,7 @@ TOOLBAR "" 0 20 0 2
 
 ENDPAGE
 
-PAGE "Uffici Imposte Dirette" -1 -1 78 18
+PAGE "Uff.Imposte Dirette" -1 -1 78 18
 
 NUMBER FLD_TABUID_CODTAB 3
 BEGIN
diff --git a/ba/batbuiv.uml b/ba/batbuiv.uml
index 815480e1f..bb4628c25 100755
--- a/ba/batbuiv.uml
+++ b/ba/batbuiv.uml
@@ -74,8 +74,13 @@ END
 STRING FLD_TABUIV_S6_COMUNI_DENCOM 50
 BEGIN
   PROMPT 3 9 "Denominazione  "
-  FLAGS "D"
-  HELP ""
+  USE LF_COMUNI KEY 2 SELECT STATO==""
+  INPUT DENCOM FLD_TABUIV_S6_COMUNI_DENCOM
+#include <comdcod.h>
+  COPY OUTPUT FLD_TABUIV_S6
+  HELP "Inserire il nome del comune dell'ufficio"
+  CHECKTYPE NORMAL
+  WARNING "Comune non presente"
 END
 
 STRING FLD_TABUIV_S6_COMUNI_PROVCOM 2
diff --git a/ba/dir.gen.asc b/ba/dir.gen.asc
index e11ea051f..ce5f97120 100755
--- a/ba/dir.gen.asc
+++ b/ba/dir.gen.asc
@@ -1,6 +1,6 @@
 begin 664 dir.gen
-M)&1I<BYG96X                                             )P  
-M $8   "@ .P* P!$:7)E8W1O<GD                                 
+M)&1I<BYG96X                                             +0  
+M $8   "@ .T* P!$:7)E8W1O<GD                                 
 M           P                                           @(" @
 M(" @(" @(" @(" @(" @(" @(" @(" @("  )75S97(N9'1A            
 M                                          !U /____]5=&5N=&D 
@@ -18,7 +18,7 @@ M                              #+ @    !486)E;&QE(&1I='1A
 M                                   T,#                      
 M                  !A>"X@<F5G:7-T<F%Z:6]N:2!D:2!L;V< (" @("  
 M)6%N86=R+F1T80                                              
-M      #) 0    !!;F%G<F%F:6-A('!E<G-O;F4@9FES:6-H92!E(&=I=7)I
+M      #7 0    !!;F%G<F%F:6-A('!E<G-O;F4@9FES:6-H92!E(&=I=7)I
 M9&EC:&4    Q,#                                              
 M                                    )6%N86=I=2YD=&$         
 M                                          "H @    !!;F%G<F%F
@@ -28,7 +28,7 @@ M            )6%N869I<RYD=&$
 M                   M      !!;F%G<F%F:6-A('!E<G-O;F4@9FES:6-H
 M90                     Q,#                                  
 M                                                )6YD:71T92YD
-M=&$                                                   #U 0  
+M=&$                                                   #S 0  
 M  !$:71T90                                                 C
 M-@                                                          
 M                        )6%T=&EV+F1T80                      
@@ -39,7 +39,7 @@ M)75N;&]C+F1T80
 M      "Q      !5;FET82<@;&]C86QI                            
 M           C.0                                              
 M                                    )7-O8VDN9'1A            
-M                                          "L      !3;V-I    
+M                                          "M      !3;V-I    
 M                                               C.2HR        
 M                                                            
 M            )6-O;75N:2YD=&$                                 
@@ -126,41 +126,41 @@ M                               3 0    !$97-C<FEZ:6]N:2!A9V=I
 M=6YT:79E(')I9VAE(&1O8W5M96YT:0     C,S,                     
 M                  !086YN96QL:2!C;VUP;&5S<RYP97(@8V]M;65S<V$ 
 M)3<W,"]B87-E+F1T80                                          
-M       Z!?____]!<F-H:79I;R!B87-E(&UO9&5L;&\@-S<P            
+M       1!/____]"87-E(&UO9&5L;&\@-S<P                        
 M           C.0                                        !086YN
-M96QL:2!C;VUP;&5S<RYP97(@8V]M;65S<V$ )3<W,"]P97)C+F1T80      
-M                                           ? /____]$871I('!E
-M<F-I<&EE;G1I                                   C-@          
+M96QL:2!C;VUP;&5S<RYP97(@8V]M;65S<V$ )3<W,"]B87-E8FES+F1T80  
+M                                          !? _____]"87-E(&UO
+M9&5L;&\@-S<P                                   C,S8         
 M                              !086YN96QL:2!C;VUP;&5S<RYP97(@
-M8V]M;65S<V$ )3<W,"]S8W!E<F,N9'1A                            
-M                  !Y /____]38VAE9&4@<&5R8VEP:65N=&D         
-M                       C.0                                  
-M      !086YN96QL:2!C;VUP;&5S<RYP97(@8V]M;65S<V$ )3<W,"]R<V-H
-M<&5R+F1T80                                            "" /__
-M__]2:6=H92!P86=A;65N=&DO=F5R<V%M96YT:2!P97)C:7!I96YT:0     C
-M,S<                                       !086YN96QL:2!C;VUP
-M;&5S<RYP97(@8V]M;65S<V$ )3<W,"]X>                           
-M                                                            
-M                                                            
+M8V]M;65S<V$ )3<W,"]P97)C+F1T80                              
+M                   ? /____]$871I('!E<F-I<&EE;G1I            
+M                       C-@                                  
+M      !086YN96QL:2!C;VUP;&5S<RYP97(@8V]M;65S<V$ )3<W,"]S8VAP
+M97(N9'1A                                              "% /__
+M__]38VAE9&4@<&5R8VEP:65N=&D                                C
+M.0                                        !086YN96QL:2!C;VUP
+M;&5S<RYP97(@8V]M;65S<V$ )3<W,"]R=F5R+F1T80                  
+M                              !8 /____]2:6=H92!D:2!V97)S86UE
+M;G1O                               C.0                      
+M                  !086YN96QL:2!C;VUP;&5S<RYP97(@8V]M;65S<V$ 
+M)3<W,"]R<&%G+F1T80                                          
+M      "  /____]2:6=H92!D:2!P86=A;65N=&\                     
+M           C.0                                        !086YN
+M96QL:2!C;VUP;&5S<RYP97(@8V]M;65S<V$ )3<W,"]Q=6%D<F]L+F1T80  
+M                                          !9 /____]1=6%D<F\@
+M3"!M;V1E;&QO(#<W,                              C.0          
+M                              !086YN96QL:2!C;VUP;&5S<RYP97(@
+M8V]M;65S<V$ )3<W,"]Q=6%D<F]H+F1T80                          
+M                  !3 /____]1=6%D<F\@:"!M;V1E;&QO(#<W,       
+M                       C.0                                  
+M      !086YN96QL:2!C;VUP;&5S<RYP97(@8V]M;65S<V$ )3<W,"]Q=6%D
+M<F]A+F1T80                                             & /__
+M__]1=6%D<F\@02!M;V1E;&QO(#<W,                              C
+M.0                                        !086YN96QL:2!C;VUP
+M;&5S<RYP97(@8V]M;65S<V$ )3<W,"]D:7!E;F0N9'1A                
+M                              #" /____]$:7!E;F1E;G1I        
+M                                   C.0                      
 M                  !086YN96QL:2!C;VUP;&5S<RYP97(@8V]M;65S<V$ 
-M &8U-"YD=&$ ;2YD=&$@(" @(" @(" @(" @(" @(" @(" @(" @("      
-M                07)C:&EV:6\@<FEG:&4@9&D@8V]M;65S<V$@(" @(" @
-M(" @(" @(   22I&,S)'0T]-+D1402 @(" @(" @(" @(" @(" @  !086YN
-M96QL:2!C;VUP;&5S<RYP97(@8V]M;65S<V$  &8U-"YD=&$ ;2YD=&$@(" @
-M(" @(" @(" @(" @(" @(" @(" @("                      07)C:&EV
-M:6\@<FEG:&4@9&D@8V]M;65S<V$@(" @(" @(" @(" @(   22I&,S)'0T]-
-M+D1402 @(" @(" @(" @(" @(" @  !086YN96QL:2!C;VUP;&5S<RYP97(@
-M8V]M;65S<V$  &8U-"YD=&$ ;2YD=&$@(" @(" @(" @(" @(" @(" @(" @
-M(" @("                      07)C:&EV:6\@<FEG:&4@9&D@8V]M;65S
-M<V$@(" @(" @(" @(" @(   22I&,S)'0T]-+D1402 @(" @(" @(" @(" @
-M(" @  !086YN96QL:2!C;VUP;&5S<RYP97(@8V]M;65S<V$  &8U-"YD=&$ 
-M;2YD=&$@(" @(" @(" @(" @(" @(" @(" @(" @("                  
-M    07)C:&EV:6\@<FEG:&4@9&D@8V]M;65S<V$@(" @(" @(" @(" @(   
-M22I&,S)'0T]-+D1402 @(" @(" @(" @(" @(" @  !086YN96QL:2!C;VUP
-M;&5S<RYP97(@8V]M;65S<V$  &8U-"YD=&$ ;2YD=&$@(" @(" @(" @(" @
-M(" @(" @(" @(" @("                      07)C:&EV:6\@<FEG:&4@
-M9&D@8V]M;65S<V$@(" @(" @(" @(" @(   22I&,S)'0T]-+D1402 @(" @
-M(" @(" @(" @(" @  !086YN96QL:2!C;VUP;&5S<RYP97(@8V]M;65S<V$ 
 M &8U-"YD=&$ ;2YD=&$@(" @(" @(" @(" @(" @(" @(" @(" @("      
 M                07)C:&EV:6\@<FEG:&4@9&D@8V]M;65S<V$@(" @(" @
 M(" @(" @(   22I&,S)'0T]-+D1402 @(" @(" @(" @(" @(" @  !086YN
diff --git a/ba/prassi.mnu b/ba/prassi.mnu
index bcd7e65b7..6f5880c09 100755
--- a/ba/prassi.mnu
+++ b/ba/prassi.mnu
@@ -26,8 +26,6 @@
 2|Cariche sociali|ba3 -0 %crs
 2|Vecchi cod.Attivita'|ba3 -0 %ois
 2|Stati esteri|ba3 -0 %sta
-2|Valute|ba3 -0 %val
-2|Lingue|ba3 -0 %lng
 3|Stampa tabelle|3
 3|Codici IVA|ba3 -1 %iva
 3|Codici Attivita'|ba3 -1 %ais
@@ -39,8 +37,6 @@
 3|Cariche sociali|ba3 -1 %crs
 3|Vecchi cod.Attivita'|ba3 -1 %ois
 3|Stati esteri|ba3 -1 %sta
-3|Valute|ba3 -1 %val
-3|Lingue|ba3 -1 %lng
 4|Contabilita'|2
 4|Persone fisiche|ba4 -1 F
 4|Persone giuridiche|ba4 -1 G
@@ -52,8 +48,8 @@
 4|Parametri di studio|cg5 -0
 4|Gestione Libro Unico|14|7
 5|Tabelle studio|1|
-5|Condizioni di pagamento|ba3 -0 %cpg
-5|Classificazione pagamenti|ba3 -6
+5|Condizioni di pagamento|ba3 -6
+5|Classificazione pagamenti|ba3 -0 %clr
 5|Descrizioni aggiuntive|ba3 -0 %dpn
 5|Codici IVA|ba3 -0 %iva
 5|Codici Attivita'|ba3 -0 %ais
diff --git a/ba/trc.gen.asc b/ba/trc.gen.asc
index 9dfc7c291..704aa2525 100755
--- a/ba/trc.gen.asc
+++ b/ba/trc.gen.asc
@@ -240,25 +240,25 @@ M O\
 M                                                            
 M                                                            
 M                                                            
-M                                               L %1)4$]!    
+M                                               K %1)4$]!    
 M      $!   ! $-/1$%.04=2      ,%   " $-/1DD           $0   '
-M %-4051/4$%)5@    $#   7 %!!258 0P        $,   : $1!5$%!1T< 
-M      4&   F %)!1U-/0P        $R   L %-4051/4D53      $#  !>
-M $-/35)%4P        $$  !A $E.1%)%4P        $C  !E $-)5E)%4P  
-M      $*  "( $-!4%)%4P        $%  "2 %-4051/4D8       $#  "7
-M $-/35)&          $$  ": $E.1%)&          $C  "> $-)5E)&    
-M      $*  #! $-!4%)&  !2      $%  #+ %!414Q21@!2      $*  #0
-M %1%3%)& %)2      $>  #: %!&05A21@!2      $*  #X $9!6%)& %)2
-M      $>   " 5!43$584D8       $*   @ 51,15A21E@       $>   J
-M 5-4051/0T]24@    $#  !( 4-/34-/4E(       $$  !+ 4E.1$-/4E( 
-M      $C  !/ 4-)5D-/4E(       $*  !R 4-!4$-/4E(       $%  !\
-M 4-/1%-4050Q      $'  "! 4-/1%-4050R      $'  "( 4-/1%-4050S
-M      $'  "/ 4-/1$-/3E12      $/  "6 45614-#          (!  "E
-M 5-/1T=.4D53      @!  "F 5)%4UI415)2      @!  "G 59!4E-,3U)%
-M4P    @!  "H 41605)33$]215,   4&  "I 5)&1$E615)300    @!  "O
-M 55&1DE)1$0       D#  "P 51)5$-&          @!  "S 51)4$]35$1%
-M3     (!  "T 4-/1$%"20        H%  "U 4-/1$-!0@        H%  "Z
-M 4Y)4T-224E$1     $*  "_ 0                                  
+M %-4051/4$%)5@    $#   7 %!!258 0P        $,   : $-/1DE%4U0 
+M      $4   F $1!5$%!1T<       4&   Z %)!1U-/0P!3      $R  ! 
+M $-/35)%4P!3      $$  !R $E.1%)%4P        $C  !V $-)5E)%4P  
+M      $*  "9 $-!4%)%4P        $%  "C $-/35)&          $$  "H
+M $E.1%)& $8       $C  "L $-)5E)&          $*  #/ $-!4%)&    
+M      $%  #9 %!414Q21@!2      $*  #> %1%3%)&  !2      $>  #H
+M %!&05A21@!2      $*   & 49!6%)&  !2      $>   0 5!43$584D8 
+M      $*   N 51,15A21E@       $>   X 5-4051/0T]24@    $#  !6
+M 4-/34-/4E( 4@    $$  !9 4E.1$-/4E( 4@    $C  != 4-)5D-/4E( 
+M      $*  "  4-!4$-/4E(       $%  "* 4-/1%-4050Q      $'  "/
+M 4-/1%-4050R      $'  "6 4-/1%-4050S      $'  "= 4-/1$-/3E12
+M      $/  "D 45614-# %0S      (!  "S 5-/1T=.4D53      @!  "T
+M 5)%4UI415)2      @!  "U 59!4E-,3U)%4P    @!  "V 41605)33$]2
+M15,   4&  "W 5)&1$E615)300    @!  "] 55&1DE)1$0 15,   D#  "^
+M 51)5$-& %)300    @!  #! 51)4$]35$1%3     (!  #" 4-/1$%"20!%
+M3     H%  ## 4-/1$-!0@!%3     H%  #( 4Y)4T-224E$1     $*  #-
+M 4-/1$-!0@!$1     H%  #. 4Y)4T-224E$1     $*  #3 0          
 M                                                            
 M                                                            
 M                                                            
@@ -280,10 +280,10 @@ M
 M                                                            
 M                                                            
 M                                                            
-M                                          $       #_'?___P4A
-M_RD<_PX2#"@6_R(#____"?____\E%?___QG___\>__________\0__\4'___
-M(_\/*B G)"L(_____P'_!B;_&Q@-__\:"_\1__\*____ @?___\3_P3_%___
-M__\$     @ !          #__P          __\            !  ( :@  
+M                                          $       #_'/___P8@
+M_R@;_PT1)Q7__R$#____"?____\D%/___QC___\=__________\/__\3'O__
+M(O\.*1\F(RH(_____P'_!R7_&A<,__\9"_\0__\*____ O____\2_P3_%@7_
+M__\$     @ !          #__P          __\            !  ( :P  
 M        __\          /__             0 "  (          /__    
 M      #__P            $  P #!         #___\         __\     
 M          #_______________________________________\     ____
@@ -338,10 +338,10 @@ M__________________________\     ____________________________
 M____________     /_______________________________________P  
 M  #_______________________________________\     ____________
 M____________________________  P 0T]$04Y!1U(      P4   $ 4T53
-M4T\          0$   8 1$%404Y!4T,     !08   < 4U1!5$].05-#    
-M 0,   T 0T]-3D%30P       00  !  4U1!5$-)5@       @$  !0 1%9!
-M4E-#258     !08  !4 5$E44U15         @$  !L 4T%50@!%4E(     
-M" $  !P 0T]$0T].255'10   P4  !T 0U!!4E121@       @$  "( 3D%:
+M4T\          0$   8 1$%404Y!4T,     !08   < 0T]-3D%30P!#    
+M 00   T 4U1!5$-)5@       @$  !$ 1%9!4E-#258     !08  !( 5$E4
+M4U15 %8      @$  !@ 4T%50@!5        " $  !D 0T]$0T].255'10  
+M P4  !H 0U!!4E121@!'10   @$  !\ 4U1!5$\ 1@       0,  "  3D%:
 M24].         0H  ", 3D%:24].         0H  "T  %-#4D-!1@      
 M 0   &4  %-#4D-!1@       0   &8  %-#4D-!1@       0   &<  %-#
 M4D-!1@       0   '$  %-#4D-!1@       0   '$  %-#4D-!1@      
@@ -377,15 +377,15 @@ M
 M                                                            
 M                                                            
 M                                                            
-M                                _________________PG_____!@7_
-M______________\!__\'_____P+_________________________________
-M  O______PK__________________________P,(!/___P(    !        
-M     /__          #__P            $  0D           #_        
+M                                _________________PC_____!03_
+M______________\!__\&_____P(*________________________________
+M  O______PG___________________________\' ____P(    !        
+M     /__          #__P            $  0@           #_        
 M    _P             !   " 0          __\          /__        
 M        ________________________________________     /______
 M_________________________________P    #_____________________
 M__________________\     ____________________________________
-M____     /_______________________________________P O $-/1$1)
+M____     /_______________________________________P M $-/1$1)
 M5%1!      ,%   ! %1)4$]!          $!   & $-/1$%.04=2      ,%
 M   ' %)!1U-/0P        $R   , %!%4E))1@        $4   ^ %!414P 
 M          $*  !2 %1%3             $>  !< %!&05@           $*
@@ -397,13 +397,13 @@ M  #% $1!5$Q!5@        (!  #& $%"24)!3@        H%  #' $-!0D)!
 M3@        H%  #, $-/3E1/4D0 1     @!  #1 $1)3DE:24]!5%0   4&
 M  #2 $Y%3D%305)#3P    $,  #8 $E-4%)&04T 30    @!  #D $-/3D1&
 M04T       @!  #E $1%1$%25#$S      @!  #F $5324Q/4@        @!
-M  #G $Y!4%  4T]#      (#  #H %-4051/4T]#      (!  #K %-)5%-/
-M0P        (!  #L %)!4%!2          ,%  #M $-!4E)!4%        (!
-M  #R $1%0T-!4E)!4%    4&  #S %)%1U-405134     @!  #Y $9)4DU!
-M5         ,%  #Z $%:0T].255'      @!  #_ $U%4TE2141$ $4   ("
-M     4-/1%-4050Q      $'   " 4-/1%-4050R      $'   ) 4-/1%-4
-M050S      $'   0 5))0U-54#(P)0    @!   7 5)%1TU!1P!'      @!
-M   8 41%3D535#$       %&   9 41%3D535#(       %&  !? 41%3D53
+M  #G $Y!4%  4T]#      (#  #H %)!4%!2 $]#      ,%  #K $-!4E)!
+M4%        (!  #P $1%0T-!4E)!4%    4&  #Q %)%1U-405134     @!
+M  #W $9)4DU!5 !!4%    ,%  #X $%:0T].255'      @!  #] $U%4TE2
+M141$      ("  #^ $-/1%-4050Q      $'     4-/1%-4050R $4   $'
+M   ' 4-/1%-4050S      $'   . 5))0U-54#(P)0    @!   5 5)%1TU!
+M1P S      @!   6 41%3D535#$ )0    %&   7 41%3D535#(       %&
+M  != 41%3D535#,       %&  "C 4E30U)#048       $*  #I 41%3D53
 M5#,       %&  "E 4E30U)#048       $*  #K 0                  
 M                                                            
 M                                                            
@@ -425,9 +425,9 @@ M
 M                                                            
 M                                                            
 M                                                            
-M                                              $      !(C)P'_
-M_Q'_"1<F____'___%1S__PTK+2S__R /#AH(__\'*O\H)2D=__\ ________
-M)"X+! H%%O__$_\>_____P+_ _\8(O_______Q 9(08,__\4__\;________
+M                                              $      !(A)0'_
+M_Q'_"1<D____'?__%1S__PTI*RK__QX/#AH(__\'*/\F(R?___\ ________
+M(BP+! H%%O__$________P+_ _\8(/_______Q 9'P8,__\4__\;________
 M______\$     0            #_            _P             !  %G
 M 0(   #___\ ____    ____ /___P       %1)   # 0(          /__
 M_P        #___\           $  @$"          #__P          __\ 
@@ -536,12 +536,12 @@ M  $!   * $-/1$%.04=24T\   ,%   + $1!5$%!1T<       4&   0 $-/
 M1$-!4@        $"   6 %-#041#05(       4&   8 $Y154]414%:    
 M  ,'   > %!%4D-154%:      0' P E %!%4D-!6E)%1$0   0' P L %!%
 M4D-!6E!%4D0   0' P S %!%4D-2251$258   0% @ Z $Y/5$4         
-M  $\   _ %$W-#            $!  ![ $-/1$%.04=#3TX   ,%  !\ $%4
-M5%!2158       @!  "! $U,058Q,C!#,0    ("  "" $U,058Q,C!#,@  
-M  ("  "$ %))0U%504P       $"  "& $5-3TQ5345.5$\   01 @"( %%5
-M05144%)%5@    $"  "9 %1)5%!23U        $!  "; %1)4$]!6@      
-M  $!  "< %!!4E1!4U,       @!  "= %!!4E1%0T1!3     4&  "> %!!
-M4E1%0T%,      4&  "D $%.3DE04D]&      ("  "J  !.3DE04D]&    
+M  $\   _ %$W-#            $"  ![ $-/1$%.04=#3TX   ,%  !] $%4
+M5%!2158       @!  "" $U,058Q,C!#,0    ("  "# $U,058Q,C!#,@  
+M  ("  "% %))0U%504P       $"  "' $5-3TQ5345.5$\   01 @") %%5
+M05144%)%5@    $"  ": %1)5%!23U        $!  "< %1)4$]!6@      
+M  $!  "= %!!4E1!4U,       @!  "> %!!4E1%0T1!3     4&  "? %!!
+M4E1%0T%,      4&  "E $%.3DE04D]&      ("  "K  !.3DE04D]&    
 M  $   "P  !.3DE04D]&      $   "P  !.3DE04D]&      $   "X  !.
 M3DE04D]&      $   "X                                        
 M                                                            
@@ -1691,38 +1691,38 @@ M______________________________________\     ________________
 M________________________     /______________________________
 M_________P    #_______________________________________\     
 M________________________________________     /______________
-M_________________________P!C $-/1$1)5%1! " @  ,%   ! $-/1$1!
+M_________________________P!. $-/1$1)5%1! " @  ,%   ! $-/1$1!
 M5$Q!5@ @  (!   & $%.3D]$24, (" @  ($   ' $52.3)#.3, (" @  02
 M @ + $52.3-#.30 3B @  02 @ = $Y!5%1615( 12 @  ,&   O $563D%4
 M14-# " @  @!   U $-/1$-!048 32 @  ,%   V $-/1%!23P!202 @  ,%
-M   [ $Y4,S Y,T%,3  @  ,&  !  $Y535-%4C$ (" @  $%  !& $1624Y&
-M,0 @(" @  4&  !+ $164U50,0  (" @  4&  !1 $Y535-%4C( (" @  $%
-M  !7 $1624Y&,@ @(" @  4&  !< $164U50,@ @(" @  4&  !B $$P3D9#
-M3TT (" @  ,%  !H $$P3DQ$25  (" @  ,%  !M $$P0T]"0@ @(" @  02
-M @!R $$P0TY%5  @(" @  02 @"$ $$P15!2158 (" @  02 @"6 $$P24E4
-M4D$ (" @  02 @"H $$P0U1%4@ @(" @  02 @"Z $$P5$E-4 !4(" @  02
-M @#, $$P24Q/4@ @(" @  02 @#> $$P5$1%5  @(" @  02 @#P $$P4E1%
-M4@ @(" @  02 @ " 4$P4D1!5 !'(" @  02 @ 4 4$P15))5  @(" @  02
-M @ F 4$P0T%24@!$(" @  02 @ X 4$P04%24@ @(" @  02 @!* 4$P1$%2
-M4@ @(" @  02 @!< 4$P4D%24@ @(" @  02 @!N 4$P4DE44TD 12 @  02
-M @"  4$P0TE.4%, (" @  02 @"2 4$P4DE43U!%5D$   02 @"D 4$P4DE4
-M3U!%4T$   02 @"V 4$P0TE)0554 " @  02 @#( 4$P3D%$3$%6 " @  ,%
-M  #: 4$P3D%#04%& " @  ,%  #? 4(P3D9#3TT (" @  ,%  #D 4(P3DQ$
-M25  (" @  ,%  #I 4(P5$92.3,       02 @#N 4(P04D           02
-M @   D(P0T],058       02 @ 2 D(P5$92-S0Y,@    02 @ D D(P04DW
-M-#DR      02 @ V D(P4DE44TD       02 @!( D(P24U0          02
-M @!: D(P5$E-4         02 @!L D(P4D]0          02 @!^ D(P04E)
-M3E!3      02 @"0 D(P4D]015-!      02 @"B D(P0TE)0554      02
-M @"T D(Q3D9#3TT       ,%  #& D(Q3E!%4@        ,%  #+ D(Q5$E.
-M1         02 @#0 D(Q5$E230        02 @#B D(Q5$E#3TT       02
-M @#T D,P3D9#3TT       ,%   & T,P3DQ!4U,       ,%   + T,P04-4
-M3U0       02 @ 0 T,P4TY34DE4      02 @ B T,P4D]010        02
-M @ T T,P0TE)0554      02 @!& T0P3D9#3TT       ,%  !8 T0P3DQ!
-M550       ,%  != T0P04-43U0       02 @!B T0P4TY34DE4      02
-M @!T T0P4D]010        02 @"& T0P0TE)0554      02 @"8 T0Q3D9#
-M3TT       ,%  "J T0Q3E!%4@        ,%  "O T0Q5$%#3U(       02
-M @"T T0Q4TY34DE4      02 @#& T0Q4D]010        02 @#8 T4P3D9#
-M3TT       ,%  #J T4P3E!%4@        ,%  #O T4P04E-4         02
+M   [ $XW,S Y,T%,3  @  ,&  !  %-%4DE% #$ (" @  $%  !& $1!5$%6
+M15)3 " @  4&  !+ $Y534523P  (" @  $+  !1 $$P3D9#3TT (" @  ,%
+M  !< $$P3DQ$25  (" @  ,%  !A $$P0T]"0@ @(" @  02 @!F $$P0TY%
+M5   (" @  02 @!X $$P15!2158 (" @  02 @"* $$P24E44D$ (" @  02
+M @"< $$P0U1%4@ @(" @  02 @"N $$P5$E-4   (" @  02 @#  $$P24Q/
+M4@  (" @  02 @#2 $$P5$1%5  @(" @  02 @#D $$P4E1%4@!4(" @  02
+M @#V $$P4D1!5  @(" @  02 @ ( 4$P15))5  @(" @  02 @ : 4$P0T%2
+M4@ @(" @  02 @ L 4$P04%24@!'(" @  02 @ ^ 4$P1$%24@ @(" @  02
+M @!0 4$P4D%24@!$(" @  02 @!B 4$P4DE44TD (" @  02 @!T 4$P0TE.
+M4%, (" @  02 @"& 4$P4DE43U!%5D$   02 @"8 4$P4DE43U!%4T$   02
+M @"J 4$P0TE)0554 " @  02 @"\ 4$P3D%$3$%6 $$   ,%  #. 4$P3D%#
+M04%& $$   ,%  #3 4(P3D9#3TT  " @  ,%  #8 4(P3DQ$25   " @  ,%
+M  #= 4(P5$92.3,  " @  02 @#B 4(P04D 3TT (" @  02 @#T 4(P0T],
+M058 (" @  02 @ & D(P5$92-S0Y,@    02 @ 8 D(P04DW-#DR      02
+M @ J D(P4DE44TD       02 @ \ D(P24U0 #0Y,@    02 @!. D(P5$E-
+M4  R      02 @!@ D(P4D]0 $D       02 @!R D(P04E)3E!3      02
+M @"$ D(P4D]015-!      02 @"6 D(P0TE)0554      02 @"H D(Q3D9#
+M3TT       ,%  "Z D(Q3E!%4@!!      ,%  "_ D(Q5$E.1 !4      02
+M @#$ D(Q5$E230        02 @#6 D(Q5$E#3TT       02 @#H D,P3D9#
+M3TT       ,%  #Z D,P3DQ!4U,       ,%  #_ D,P04-43U0       02
+M @ $ T,P4TY34DE4      02 @ 6 T,P4D]010        02 @ H T,P0TE)
+M0554      02 @ Z T0P3D9#3TT       ,%  !, T0P3DQ!550       ,%
+M  !1 T0P04-43U0       02 @!6 T0P4TY34DE4      02 @!H T0P4D]0
+M10        02 @!Z T0P0TE)0554      02 @", T0Q3D9#3TT       ,%
+M  "> T0Q3E!%4@        ,%  "C T0Q5$%#3U(       02 @"H T0Q4TY3
+M4DE4      02 @"Z T0Q4D]010        02 @#, U%#3TU0 %(       $6
+M  #> U%355!0 $E4      $7  #T TY355!030        ($   +!$Q53U9%
+M4E,       <!   /!%1)4$]615)3      <!   0!$4P04E-4         02
 M @#T T4P4D]010        02 @ &!$4P4TY34DE4      02 @ 8!$4Q3D9#
 M3TT       ,%   J!$4Q3E!%4@        ,%   O!$4Q4T-/4@        02
 M @ T!$4Q0D-/30        02 @!&!$4Q4D]010        02 @!8!$4Q04-/
@@ -1731,32 +1731,40 @@ M @".!$4R3D9#3TT       ,%  "@!$4R3E!%4@        ,%  "E!$4R4D]0
 M10        02 @"J!$4R4U-2250       02 @"\!$8P4U))5$$       02
 M @#.!$8P4D]014$       02 @#@!$8P5$%#0T$       02 @#R!$8P141!
 M0T-!      02 @ $!48P15))34$       02 @ 6!48P4U-2251"1@    02
-M @ H!0                       "@["$$@#TPB0E94%U<8,08**C,=%!X-
-M_Q8X'QE<&QPN%24U-BLP,AHW0$8 +$=(2R9*42\A4B<"$SD!50XC6!(D*0<,
-M$5-96C];30-@13XT241/4 1A7ET\/2UB.D-."Q!?!0D!     0 ! @0#    
+M @ H!0                       "4X"#X="?\?/___%/\5+@;_)S :$1M)
+M2A,U'!8+&!DK$B(R,R@M+Q<T/4, *41%2"-' RP>3"0"$#8!#$T@2P\A)@?_
+M#O___SS_____0CLQ1D$$"O___P4Y.BK_-T#__PW___\!     0 ! @0#    
 M  #______P                        #_________________________
 M______________\     ________________________________________
 M     /_______________________________________P    #_________
 M______________________________\     ________________________
 M________________     /______________________________________
-M_P    #_______________________________________\ !0!#3T1$2514
-M00 @(  #!0   0!425!/00!,058 (  ! 0  !@!#3T1!3D%'4@ @(  #!0  
-M!P!&05140DE, " @(  $$@( # !&3$%'0U0  $X@(  ( 0  '@!.05145D52
-M $4@(  #!@  +P!%5DY!5$5#0P @(  ( 0  -0!#3T1#04%& $T@(  *!0  
-M-@!#3T104D\ 4D$@(  #!0  .P!.54U315(Q $U!(  !!0  0 !$5DE.1C$ 
-M(" @(  %!@  10!$5E-54#$ (" @(  %!@  2P!.54U315(R " @(  !!0  
-M40!$5DE.1C( (" @(  %!@  5@!$5E-54#( (" @(  %!@  7   4DE&4%)4
-M(" @(           5$],3" @(" @(           5$%',2 @(" @(       
-M    5$%',B @(" @(           5$%',R @(" @(           5%%504Y4
-M(" @(           0T]-4$P@(" @(           5$9,(" @(" @(       
-M    0T]$5D545" @(           4$]25$\@(" @(           1D%44U0@
-M(" @(           149&4U0@(" @(           0T]24E!!1R @(       
-M    4$533R @(" @(           5%)!4U!-1" @(           1$%40512
-M(" @(           3U)!5%(@(" @(           0D],4U0@(" @(       
-M    24U015-04D4@(           3DE04D4@(" @(           04Q44%)%
-M(" @(           1$]#4%)%(" @(           259!4%)%(" @(       
-M    24U015-04D4@(           3DE04D4@(" @(           04Q44%)%
-M(" @(           1$]#4%)%(" @(                               
+M_P    #_______________________________________\ /0!#3T1$2514
+M00 @(  #!0   0!%,$Y&0T]- %8 (  #!0  !@!%,$Y015( 4@ @(  #!0  
+M"P!%,$%)35   " @(  $$@( $ !%,%)/4$4  $X@(  $$@( (@!%,%-.4U))
+M5  @(  $$@( - !%,4Y&0T]-   @(  #!0  1@!%,4Y015(  $T@(  #!0  
+M2P!%,5-#3U( 4D$@(  $$@( 4 !%,4)#3TT  $U!(  $$@( 8@!%,5)/4$4 
+M(" @(  $$@( = !%,4%#3TT (" @(  $$@( A@!%,4)#3TTR " @(  $$@( 
+MF !%,5)/4$4R " @(  $$@( J@!%,DY&0T]- " @(  #!0  O !%,DY015( 
+M(" @(  #!0  P0!%,E)/4$4 (" @(  $$@( Q@!%,E-34DE4 " @(  $$@( 
+MV !&,%-2251! " @(  $$@( Z@!&,%)/4$5! " @(  $$@( _ !&,%1!0T-!
+M " @(  $$@( #@%&,$5$04-#00 @(  $$@( ( %&,$5224U! " @(  $$@( 
+M,@%&,%-34DE40D8 (  $$@( 1 %&,%)/4$5"1@ @(  $$@( 5@%&,%-35D$ 
+M(" @(  $$@( : %&,%)/4$5600 @(  $$@( >@%&,5103%5! " @(  $$@( 
+MC %&,5)/4$5! " @(  $$@( G@%&,5-34DE4 " @(  $$@( L %&,5)/4$4 
+M(" @(  $$@( P@%&,E-34DE4 " @(  $$@( U %&,E)/4$4 (" @(  $$@( 
+MY@%',$Y&0T]- $4@(  #!0  ^ %',$Y!6DDQ " @(  $$ ( _0%',%5$14XQ
+M " @(  $$@( #0)',%5.050Q " @(  $$@( 'P)',$E55$DR " @(  $$@( 
+M,0)',%)/4$4 4D4@(  $$@( 0P)',%534DE4,P @(  $$@( 50)',%)!0T,S
+M " @(  $$@( 9P)',%))35 S " @(  $$@( >0)',%5.4U))5#,    $$@( 
+MBP)',%534$4        $$@( G0)',%5004<        $$@( KP)',$Y015( 
+M       #!0  P0)',55#3U(        $$@( Q@)',5534DE4       $$@( 
+MV )',5)!0T,        $$@( Z@)',5))35         $$@( _ )',55.4U))
+M5      $$@( #@-(,$-/1$Q!5@     $$@( ( -(,$-/3$1)4      $$@( 
+M,@-(,$Y05D522      #!0  1 -(,$Y13$%'1P     "!   20-,,$-#3TY#
+M,0     ! P  30-,,$-#3TY#,@     ! P  4 -,,$-#3TY#,P     ! P  
+M4P-,,$-415,Q       " P  5@-,,$-415,R       " P  60-,,$-415,S
+M       " P  7 ,                                             
 M                                                            
 M                                                            
 M                                                            
@@ -1771,26 +1779,18 @@ M
 M                                                            
 M                                                            
 M                                                            
-M                                                            
-M                                                            
-M                                                            
-M                                                            
-M                                                            
-M                                                            
-M                                                            
-M                                                            
-M                                                   !________
-M_____________________________________________P3_ /__________
-M_P/_______________\"________________________________________
-M____ 0    ,  0(         ____                            ____
+M                                                  #_"?\!"R'_
+M#/__&_________\G____'2____\1__\.&!P?(A((_P8''AD5  H-) \@,#$0
+M+B@R-/____\X_____Q,4(Q8S-3<E+0+_)BP$&@7__RDJ__\7____.SP#*S8Y
+M.O__ 0    $  0(         ____                            ____
 M____________________________________     /__________________
 M_____________________P    #_________________________________
 M______\     ________________________________________     /__
 M_____________________________________P    #_________________
 M______________________\     ________________________________
-M________  \ 0T]$1$E45$$ ("   P4   $ 5$E03T$ (" @("   0$   8 
-M0T]$04Y!1U( ("   P4   < 3E!23T< 3  @("   @0   P 0T]$5%))0@!.
-M("   @0  !  0T]$0T%54P!%("  "0(  !0 1$%4041/0P @("  !08  !8 
+M________  4 0T]$1$E45$$ ("   P4   $ 5$E03T$ (" @("   0$   8 
+M0T]$04Y!1U( ("   P4   < 1D%45$))3  @("  !!("  P 1DQ!1T-4  !.
+M("  " $  !X 0T]$0T%54P!%("  "0(  !0 1$%4041/0P @("  !08  !8 
 M3E5-1$]# $U-("   0<  !P 0T]-4$5.4T\ ("  !! " ", 4U!%4T4 3$%-
 M02  !! " #, 259! $Q4(" @("  !! " $, 5$]404Q% " @("  !!(" %, 
 M05)21512 " @("   0$  &4 1DQ!1TE# " @("   0$  &8 5$]44DE4 " @
@@ -1828,22 +1828,22 @@ M
 M                                                            
 M                                                            
 M                                                            
-M             ?___________P3_________!@<#_PG_________________
-M_____PX(_P#______PK_____!?______________ O___PO___________\-
-M#/_______________________P$    $  $" P       /____\         
+M             ?______________________________________________
+M______\$_P#___________\#________________ O__________________
+M_________________________P$    #  $" P       /____\         
 M                 /_______________________________________P  
 M  #_______________________________________\     ____________
 M____________________________     /__________________________
 M_____________P    #_______________________________________\ 
 M    ________________________________________     /__________
-M_____________________________P 2 $-/1$1)5%1! " @  ,%   ! %1)
+M_____________________________P 1 $-/1$1)5%1! " @  ,%   ! %1)
 M4$]! " @(" @  $!   & $-/1$%.04=2 " @  ,%   ' $Y04D]' $,@(" @
-M  ($   , $Y224=! $( 3B @  ($   0 $1!5$%004< 12 @  4&   4 $E-
-M4$].24))3$4   00 @ : %!%4D, 0P!-32 @  ("   J %))5$5.551! " @
-M  00 @ L $-/35!%3E-/ $$@  00 @ \ $Y%5%1/ " @(" @  00 @!, %9%
-M4E,Q,#$U " @  @!  !< $1!5$%615)3 " @  4&  != %1)4$]615)3 " @
-M  $!  !C $E-4%9%4E,  " @  00 @!D $Q53U9%4E, (" @  $!  !T $Y5
-M345220  (" @  $+  !U $-/1%%500 @(" @  $"  "  $-/1%%500 @(" @
+M  ($   , $-/1%1224( 3B @  ($   0 $-/1$-!55, 12 @  D"   4 $1!
+M5$%$3T, 3$4   4&   6 $Y5341/0P!-32 @  $'   < $-/35!%3E-/ " @
+M  02 @ C %-015-% %-/ $$@  02 @ U $E600!/ " @(" @  02 @!' %1/
+M5$%,10 U " @  02 @!9 $%24D544@!3 " @  $!  !K $9,04=)0P!3 " @
+M  $!  !L %1/5%))5    " @  02 @!M $U%4T5# %, (" @  ("  !_ $%.
+M3D]#    (" @  ($  "! $-/1%%500 @(" @  $"  "  $-/1%%500 @(" @
 M  $"  "0  !404<S(" @(" @          !4455!3E0@(" @          !#
 M3TU03" @(" @          !41DP@(" @(" @          !#3T161514(" @
 M          !03U)43R @(" @          !&05135" @(" @          !%
@@ -1876,21 +1876,21 @@ M
 M                                                            
 M                                                            
 M                                                            
-M                                  '_______\%_____________PL*
-M _\-____# [_!O______________"?\ #_____________\1__\$__\(____
-M_P+___\0________________!_____________________\!    !0 ! @4$
+M                                  '___________\$_________P8'
+M _\)______________________\/" X ______\*_____P7_____________
+M_P+___\+____________#0S___\0__________________\!    !  ! @,$
 M      #______P                        #_____________________
 M__________________\     ____________________________________
 M____     /_______________________________________P    #_____
 M__________________________________\     ____________________
 M____________________     /__________________________________
-M_____P    #_______________________________________\     3E5-
-M0T]-32 @(           1$530U(@(" @(           0T]$0TQ)(" @(   
-M        4D%'4T]#(" @(           5$E03U!!3DX@(           4U!%
-M4U-/4D4@(           0T]$34%#(" @(           1$%404-/34T@(   
-M        5D5.05154D$@(           4U!%4U-,04U!(           4DE&
-M3%0@(" @(           4DE&3$,@(" @(           4DE&5%0@(" @(   
-M        4DE&5$,@(" @(           4DE&4%)#(" @(           4DE&
+M_____P    #_______________________________________\ #P!#3T1$
+M251400 @(  #!0   0!425!/00 @(" @(  ! 0  !@!#3T1!3D%'4@ @(  #
+M!0  !P!.4%)/1P!#(" @(  "!   # !.4DE'00!!3DX@(  "!   $ !615)3
+M,3 Q-0 @(  ( 0  % !$051!5D524P @(  %!@  %0!425!/5D524P @(  !
+M 0  &P!)35!615)3 $$@(  $$@( ' !,54]615)3 $U!(  ! 0  +@!.54U%
+M4D\ (" @(  !"P  +P!315))10 @(" @(  !!0  .@!.54U615)3 " @(  #
+M!0  /P!#3T1154$ (" @(  ! @  1 !2251%3E5400 @(  $$@( 1@  4DE&
 M4%)4(" @(           5$],3" @(" @(           5$%',2 @(" @(   
 M        5$%',B @(" @(           5$%',R @(" @(           5%%5
 M04Y4(" @(           0T]-4$P@(" @(           5$9,(" @(" @(   
@@ -1924,21 +1924,21 @@ M
 M                                                            
 M                                                            
 M                                                            
-M                                                      #_____
-M____________________________________________________________
-M____________________________________________________________
-M________    9                                               
-M________________________________________     /______________
+M                                                       !____
+M__________________\%_P/_!____P8(____________________  D,____
+M______\*#?__!/__#O____\"_________________PO_________________
+M________ @    4  0(#!       ______\                        "
+M  S_____________________________________     /______________
 M_________________________P    #_____________________________
 M__________\     ________________________________________    
 M /_______________________________________P    #_____________
 M__________________________\     ____________________________
-M____________     $Y534-/34T@("           $1%4T-2(" @("      
-M     $-/1$-,22 @("           %)!1U-/0R @("           %1)4$]0
-M04Y.("           %-015-33U)%("           $-/1$U!0R @("      
-M     $1!5$%#3TU-("           %9%3D%455)!("           %-015-3
-M3$%-02           %))1DQ4(" @("           %))1DQ#(" @("      
-M     %))1E14(" @("           %))1E1#(" @("           %))1E!2
+M____________  X 0T]$1$E45$$ ("   P4   $ 5$E03T$ (" @("   0$ 
+M  8 0T]$04Y!1U( ("   P4   < 3E!23T< 0R @("   @0   P 3E))1T$ 
+M04Y.("   @0  !  1$%405!!1P!%("  !08  !0 24U03TY)0DE,10  !!("
+M !H 4$520P!#3TU-("   @(  "P 4DE414Y55$$ ("  !!(" "X 0T]-4$5.
+M4T\ 02  !!(" $  3D545$\ (" @("  !!(" %( 3E5-5D524P @("   P4 
+M &0 3E5-4$%' " @("   P4  &D 4U!%4T$ (" @("  !!(" &X  %))1E!2
 M0R @("           %))1E!25" @("           %1/3$P@(" @("      
 M     %1!1S$@(" @("           %1!1S(@(" @("           %1!1S,@
 M(" @("           %1154%.5" @("           $-/35!,(" @("      
@@ -1973,21 +1973,21 @@ M
 M                                                            
 M                                                            
 M                                                            
-M                ____________________________________________
-M____________________________________________________________
-M_____________________________P   &0                         
-M                     /______________________________________
+M                 ?_______P7______________PH#______\-__\&____
+M__________\)_P +_________________P3__PC_____ O______________
+M______\'#/___________________P(    %  $" P0      /______    
+M                     P +#/__________________________________
 M_P    #_______________________________________\     ________
 M________________________________     /______________________
 M_________________P    #_____________________________________
 M__\     ________________________________________     /______
-M_________________________________P    !.54U#3TU-(" @        
-M  !$15-#4B @(" @          !#3T1#3$D@(" @          !204=33T,@
-M(" @          !425!/4$%.3B @          !34$534T]212 @        
-M  !#3T1-04,@(" @          !$051!0T]-32 @          !614Y!5%52
-M02 @          !34$534TQ!34$@          !2249,5" @(" @        
-M  !2249,0R @(" @          !224945" @(" @          !224940R @
-M(" @          !224904D,@(" @          !224904E0@(" @        
+M_________________________________P / $-/1$1)5%1! " @  ,%   !
+M %%,1%8 4B @(" @  4&   & %%,35  3$D@(" @  ("   , %%,05  3T,@
+M(" @  ($   . %%,3%8 4$%.3B @  <!   2 %%,5%8 4T]212 @  <!   3
+M %%,0U0 04,@(" @  ($   4 %%,04( 0T]-32 @  ("   8 %%,4T52244 
+M02 @  $%   : %%,3E5-15)/ $$@  $+   ? %%,0T]$455! " @  $"   J
+M %%,4DE4149& " @  02 @ L %%,4DE45D52 " @  02 @ ^ %%,4E-3 " @
+M(" @  $"  !0 %%,3D]410 @(" @  $'  !2  !224904E0@(" @        
 M  !43TQ,(" @(" @          !404<Q(" @(" @          !404<R(" @
 M(" @          !404<S(" @(" @          !4455!3E0@(" @        
 M  !#3TU03" @(" @          !41DP@(" @(" @          !#3T161514
@@ -2021,18 +2021,18 @@ M
 M                                                            
 M                                                            
 M                                                            
-M                                     /______________________
-M____________________________________________________________
-M__________________________________________________\   !D    
-M                                          #_________________
+M                                     /\+_____P/__PW_!___"?__
+M"@+_______________________________\ ________#@;_____"/______
+M____!?__________________# '_________!/____________\"    "@ !
+M @,$!08'" G_____________                  H  @,!! 4&!P@)____
 M______________________\     ________________________________
 M________     /_______________________________________P    #_
 M______________________________________\     ________________
 M________________________     /______________________________
-M_________P    #_______________________________________\     
-M3E5-0T]-32 @(           1$530U(@(" @(           0T]$0TQ)(" @
-M(           4D%'4T]#(" @(           5$E03U!!3DX@(           
-M4U!%4U-/4D4@(           0T]$34%#(" @(           1$%404-/34T@
+M_________P    #_______________________________________\ !@!#
+M3T1$251400 @(  #!0   0!(,4%.3D\ (" @(  "!   !@!(,4Y04D]' " @
+M(  "!   "@!(,45.5$4 (" @(  !(0  #@!(,41!5 !!3DX@(  $$@( +P!(
+M,4Q!5@!/4D4@(  $$@( 00  0T]$34%#(" @(           1$%404-/34T@
 M(           5D5.05154D$@(           4U!%4U-,04U!(           
 M4DE&3%0@(" @(           4DE&3$,@(" @(           4DE&5%0@(" @
 M(           4DE&5$,@(" @(           4DE&4%)#(" @(           
@@ -2070,15 +2070,15 @@ M
 M                                                            
 M                                                            
 M                                                          #_
+M____!/___________P+_________________________________ ?__ /__
 M____________________________________________________________
-M____________________________________________________________
-M____________    9                                           
+M_____P4#____ 0    ,  0(         ____                        
 M    ________________________________________     /__________
 M_____________________________P    #_________________________
 M______________\     ________________________________________
 M     /_______________________________________P    #_________
 M______________________________\     ________________________
-M________________     $Y534-/34T@("           $1%4T-2(" @("  
+M________________  $ 0T]$1$E45$$ ("   P4   $  $1%4T-2(" @("  
 M         $-/1$-,22 @("           %)!1U-/0R @("           %1)
 M4$]004Y.("           %-015-33U)%("           $-/1$U!0R @("  
 M         $1!5$%#3TU-("           %9%3D%455)!("           %-0
@@ -2119,24 +2119,24 @@ M
 M                                                            
 M                                                            
 M                    ________________________________________
-M____________________________________________________________
-M_________________________________P   &0                     
+M_________________P#_________________________________________
+M_________________________________P$    !             /\     
 M                         /__________________________________
 M_____P    #_______________________________________\     ____
 M____________________________________     /__________________
 M_____________________P    #_________________________________
 M______\     ________________________________________     /__
-M_____________________________________P    !.54U#3TU-(" @    
-M      !$15-#4B @(" @          !#3T1#3$D@(" @          !204=3
-M3T,@(" @          !425!/4$%.3B @          !34$534T]212 @    
-M      !#3T1-04,@(" @          !$051!0T]-32 @          !614Y!
-M5%5202 @          !34$534TQ!34$@          !2249,5" @(" @    
-M      !2249,0R @(" @          !224945" @(" @          !22494
-M0R @(" @          !224904D,@(" @          !224904E0@(" @    
-M      !43TQ,(" @(" @          !404<Q(" @(" @          !404<R
-M(" @(" @          !404<S(" @(" @          !4455!3E0@(" @    
-M      !#3TU03" @(" @          !41DP@(" @(" @          !#3T16
-M1514(" @          !03U)43R @(" @          !&05135" @(" @    
+M_____________________________________P 8 $-/1$1)5%1! " @  ,%
+M   ! $-/1%5.3$]# " @  (#   & $-/1$E0 $D@(" @  ,&   ) $-/1$9)
+M $,@(" @  $0   / $-/1TY/344 3B @  $4   ? $Y/344 4T]212 @  $/
+M   S %-%4U-/ $,@(" @  <!  !" $1!5$%.00!-32 @  4&  !# $-/355.
+M14Y! " @  $4  !) %!23U9.00!!34$@  $"  != $-/355.15)% " @  $4
+M  !? %!23U9210 @(" @  $"  !S $E.1%)% " @(" @  $9  !U $52141%
+M " @(" @  @!  ". $-/1$52141%,0 @  ,'  "/ $-/1$52141%,@ @  ,'
+M  "6 $-/1$52141%,P @  ,'  "= $-/1$52141%-  @  ,'  "D $-/1$52
+M141%-0 @  ,'  "K $1)4DQ!5@ @(" @  4&  "R $1&4DQ!5@ @(" @  4&
+M  "X $$P0T%4 " @(" @  ("  "^ $$P4U15 " @(" @  (!  #  $$P0TE6
+M %14(" @  (!  #!  !03U)43R @(" @          !&05135" @(" @    
 M      !%1D935" @(" @          !#3U)24$%'(" @          !015-/
 M(" @(" @          !44D%34$U$(" @          !$051!5%(@(" @    
 M      !/4D%44B @(" @          !"3TQ35" @(" @          !)35!%
@@ -2166,9 +2166,9 @@ M
 M                                                            
 M                                                            
 M                                                            
-M                                         /__________________
-M____________________________________________________________
-M______________________________________________________\   !D
+M                                         /\#_________PS_____
+M____#@(6#Q 1$@0-______\(!@O_________!?\ ____ ?__!___________
+M______\5____%/____\7_____PK_______________\)$_________\   !D
 M                                              #_____________
 M__________________________\     ____________________________
 M____________     /_______________________________________P