Correzioni per XI

git-svn-id: svn://10.65.10.50/trunk@2832 c028cbd2-c16b-5b4b-a496-9718f37d4682
1996-05-16 09:06:53 +00:00 · 1996-05-16 09:06:53 +00:00 · 20b383cc49
commit 20b383cc49
parent 8403ea28ad
76 changed files with 996 additions and 1029 deletions
--- a/ba/ba1100b.uml
+++ b/ba/ba1100b.uml
@ -45,18 +45,21 @@ STRING FLD_FS 5
 BEGIN
  PROMPT 2 7 "Separatore di campi   "
  HELP "Carattere seperatore dei campi"
+  FLAGS "P"
 END

 STRING FLD_FD 5
 BEGIN
  PROMPT 40 7 "Delimitatore di campi "
  HELP "Carattere delimitatore di campi"
+  FLAGS "P"
 END

 STRING FLD_RS 5
 BEGIN
  PROMPT 2 9 "Separatore di record  "
  HELP "Carattere delimitatore di record"
+  FLAGS "P"
 END

 BUTTON DLG_OK 10 2
--- a/ba/ba1100c.uml
+++ b/ba/ba1100c.uml
@ -21,18 +21,21 @@ STRING FLD_FS 5
 BEGIN
  PROMPT 2 5 "Separatore di campi   "
  HELP "Carattere separatore dei campi"
+  FLAGS "P"
 END

 STRING FLD_FD 5
 BEGIN
  PROMPT 2 7 "Delimitatore di campi "
  HELP "Carattere delimitatore dei campi"
+  FLAGS "P"
 END

 STRING FLD_RS 5
 BEGIN
  PROMPT 2 9 "Separatore di record  "
  HELP "Carattere delimitatore dei record"
+  FLAGS "P"
 END

 BUTTON DLG_OK 9 2
--- a/ba/ba1100d.uml
+++ b/ba/ba1100d.uml
@ -130,17 +130,17 @@ BEGIN
  HELP "Descrizione del campo"
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -13 -1 ""
 END

-BUTTON DLG_CANCEL 8 2
+BUTTON DLG_CANCEL 10 2
 BEGIN
  PROMPT -23 -1 ""
 END

-BUTTON DLG_DELREC 8 2
+BUTTON DLG_DELREC 10 2
 BEGIN
  PROMPT -33 -1 "Elimina"
  MESSAGE EXIT,K_DEL
@ -152,7 +152,7 @@ ENDMASK

 PAGE "Chiave" -1 -1 79 9

-STRING F_KEXPR 70
+STRING F_KEXPR 70 60
 BEGIN
  PROMPT 1 2 "Espress."
  HELP "Espressione dell'archivio"
@ -164,17 +164,17 @@ BEGIN
  PROMPT 1 4 "Chiavi duplicate"
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -13 -1 ""
 END

-BUTTON DLG_CANCEL 8 2
+BUTTON DLG_CANCEL 10 2
 BEGIN
  PROMPT -23 -1 ""
 END

-BUTTON DLG_DELREC 8 2
+BUTTON DLG_DELREC 10 2
 BEGIN
  PROMPT -33 -1 "Elimina"
  MESSAGE EXIT,K_DEL
--- a/ba/ba1300a.uml
+++ b/ba/ba1300a.uml
@ -28,27 +28,27 @@ BEGIN
        PROMPT 9 4 "Iterazioni"
 END

-BUTTON DLG_FILES 9 2 
+BUTTON DLG_FILES 10 2
 BEGIN
-  PROMPT 30 1 "~Files"
+  PROMPT 29 1 "~Files"
  MESSAGE EXIT,K_F4
 END

-BUTTON DLG_REPORT 9 2
+BUTTON DLG_REPORT 10 2
 BEGIN
-	PROMPT 30 3 "~Report"
+  PROMPT 29 3 "~Report"
  MESSAGE EXIT,K_F5
 END

-BUTTON DLG_TEST 9 2 
+BUTTON DLG_TEST 10 2
 BEGIN
-	PROMPT 30 5 "~Test"
+  PROMPT 29 5 "~Test"
  MESSAGE EXIT,K_ENTER
 END

-BUTTON DLG_CANCEL 9 2
+BUTTON DLG_CANCEL 10 2
 BEGIN
-	PROMPT 30 7 ""
+  PROMPT 29 7 ""
 END
 ENDMASK

--- a/ba/ba1300b.uml
+++ b/ba/ba1300b.uml
@ -2,7 +2,7 @@
 #include <tokens.h>
 #include "ba1300a.h"

-PAGE "Debugging" -1 -1 42 7
+PAGE "Debugging" -1 -1 42 8

 NUMBER F_FILE 3
 BEGIN
@ -19,12 +19,12 @@ BEGIN
  HELP "Nome del file della sequenza"
 END

-BUTTON DLG_OK 9 2
+BUTTON DLG_OK 10 2
 BEGIN
        PROMPT -12 6 ""
 END

-BUTTON DLG_CANCEL 9 2
+BUTTON DLG_CANCEL 10 2
 BEGIN
        PROMPT -22 6 ""
 END
--- a/ba/ba2100a.uml
+++ b/ba/ba2100a.uml
@ -23,12 +23,12 @@ BEGIN
 END

   
-BUTTON DLG_OK  9 2
+BUTTON DLG_OK  10 2
 BEGIN 
 	PROMPT -12 -1 ""
 END   
                            
-BUTTON DLG_CANCEL 9 2
+BUTTON DLG_CANCEL 10 2
 BEGIN
 	PROMPT -22 -1 ""
 END
--- a/ba/ba2100c.uml
+++ b/ba/ba2100c.uml
@ -1,4 +1,4 @@
-PAGE "POSIZIONAMENTO MODULI" -1 -1 49 6
+PAGE "POSIZIONAMENTO MODULI" -1 -1 55 6

 TEXT DLG_NULL
 BEGIN
--- a/ba/ba2100f.uml
+++ b/ba/ba2100f.uml
@ -19,7 +19,7 @@ END

 ENDPAGE

-PAGE "CAMPO DI STAMPA" -1 -1 78 21
+PAGE "Parametri di stampa" -1 -1 78 21

 LIST F_CLASS 10
 BEGIN
@ -219,29 +219,29 @@ STRING F_FILE1 80 60
 BEGIN
 PROMPT 2 13 "Archivio "
 HELP "Nome dell'archivio relativo al campo"
-FLAGS "D"
+FLAGS "DB"
 END

-BUTTON F_BUT_FILE1 2 1
-BEGIN          
-PROMPT 73 13 "*"
-PICTURE 109         
-GROUP 7  
-END
+//BUTTON F_BUT_FILE1 2 1
+//BEGIN
+//PROMPT 73 13 "*"
+//PICTURE 109
+//GROUP 7
+//END

 STRING F_FIELD1 80 60
 BEGIN
 PROMPT 2 14 "Campo 1  "
 HELP "Nome del campo su file"
-FLAGS "D"
+FLAGS "DB"
 END

-BUTTON F_BUT_FIELD1 2 1
-BEGIN          
-PROMPT 73 14 "*"
-PICTURE 109                            
-GROUP 7  
-END
+//BUTTON F_BUT_FIELD1 2 1
+//BEGIN
+//  PROMPT 73 14 "*"
+//  PICTURE 109
+//  GROUP 7
+//END

 STRING F_FIELDREF1 20 16
 BEGIN
@ -268,29 +268,29 @@ STRING F_FILE2 60
 BEGIN
 PROMPT 2 16 "Archivio "
 HELP "Nome dell'archivio relativo al campo"
-FLAGS "D"
+FLAGS "DB"
 END

-BUTTON F_BUT_FILE2 2 1
-BEGIN          
-PROMPT 73 16 "*"
-PICTURE 109         
-GROUP 7  
-END
+//BUTTON F_BUT_FILE2 2 1
+//BEGIN
+//PROMPT 73 16 "*"
+//PICTURE 109
+//GROUP 7
+//END

 STRING F_FIELD2 60
 BEGIN
 PROMPT 2 17 "Campo 2  "
 HELP "Nome del campo su file"
-FLAGS "D"
+FLAGS "DB"
 END

-BUTTON F_BUT_FIELD2 2 1
-BEGIN          
-PROMPT 73 17 "*"
-PICTURE 109                            
-GROUP 7  
-END
+//BUTTON F_BUT_FIELD2 2 1
+//BEGIN
+//PROMPT 73 17 "*"
+//PICTURE 109
+//GROUP 7
+//END

 STRING F_FIELDREF2 16
 BEGIN
@ -319,7 +319,7 @@ END

 ENDPAGE

-PAGE "SUPERPRASSI" -1 -1 78 20
+PAGE "Parametri avanzati" -1 -1 78 20

 GROUPBOX DLG_NULL 78 3
 BEGIN
--- a/ba/ba2100s.uml
+++ b/ba/ba2100s.uml
@ -30,7 +30,7 @@ END

 STRING F_CTP 1
 BEGIN
-PROMPT 40 3 "Carattere posizionamento"
+PROMPT 38 3 "Carattere posizionamento  "
 HELP "Carattere da utilizzare per il posizionamento del modulo"
 END

@ -51,7 +51,7 @@ END

 TEXT DLG_NULL
 BEGIN
-PROMPT 40 5 "Colonne di posizionamento"
+PROMPT 38 5 "Colonne di posizionamento"
 END

 NUMBER F_IPX 3
@ -79,7 +79,7 @@ END

 NUMBER F_Y 3
 BEGIN
-PROMPT 40 6 "Spostamento verticale   "
+PROMPT 38 6 "Spostamento verticale     "
 END

 SPREADSHEET F_FIELDS 0 8
@ -90,7 +90,7 @@ BEGIN
  ITEM   "Pr"
  ITEM   "Y@2"
  ITEM   "X@3"
-  ITEM   "Lun."
+  ITEM   "Larg."
  ITEM   "Col."
  ITEM   "Intestazione colonna@40"
  ITEM   "Spazi"
--- a/ba/ba2100u.uml
+++ b/ba/ba2100u.uml
@ -38,14 +38,14 @@ STRING F_FILE1 50
 BEGIN
  PROMPT 2 3 "Archivio  "
  HELP "Nome dell'archivio su cui iterare la sottosezione"
-//  FLAGS "D"
+  FLAGS "B"
 END
 	   
-BUTTON F_BUT_FILE1 2 1
-BEGIN          
-  PROMPT 63 3 "*"
-  PICTURE 109         
-END
+//BUTTON F_BUT_FILE1 2 1
+//BEGIN          
+//  PROMPT 63 3 "*"
+//  PICTURE 109         
+//END
                      
 STRING F_FIELDREF1 16
 BEGIN
--- a/ba/ba21dt.uml
+++ b/ba/ba21dt.uml
@ -2,7 +2,7 @@
                                                 
 PAGE "Impostazione formato date" -1 -1 55 10
                                                 
-LIST F_DFORMAT 16
+LIST F_DFORMAT 18
 BEGIN
 PROMPT 1 1 "Tipo data       "   
 ITEM "1|Giorno Mese Anno"
@ -14,7 +14,7 @@ ITEM "5|Mese"
 ITEM "6|Giorno"
 END           

-LIST F_DDAY 16
+LIST F_DDAY 18
 BEGIN
 PROMPT 1 2 "Formato giorno  " 
 ITEM "4|Con zeri(es. 02)"
@ -23,7 +23,7 @@ ITEM "5|In lettere"
 ITEM "6|Giorno settimana"
 END           

-LIST F_DMONTH 16
+LIST F_DMONTH 18
 BEGIN
 PROMPT 1 3 "Formato mese    " 
 ITEM "4|Con zeri(es. 02)"
@ -32,14 +32,14 @@ ITEM "5|In lettere"
 ITEM "7|Trimestre"
 END           

-LIST F_DYEAR 16
+LIST F_DYEAR 18
 BEGIN
 PROMPT 1 4 "Formato anno    "  
 ITEM "2|Breve (2 cifre)"
 ITEM "4|Lungo (4 cifre)"
 END           

-LIST F_DSEP 5
+LIST F_DSEP 8
 BEGIN
 PROMPT 1 5 "Separatore      "     
 ITEM "-|-"
--- a/ba/ba3300a.uml
+++ b/ba/ba3300a.uml
@ -95,7 +95,7 @@ BEGIN
  HELP "Provincia dell'intestatario del registro"
 END
                       
-LIST F_STATO 18
+LIST F_STATO 20
 BEGIN
  PROMPT 3 10 "Stato            "
  FIELD LF_ANAG->STATOPAIV
--- a/ba/ba3500a.uml
+++ b/ba/ba3500a.uml
@ -6,7 +6,7 @@ TOOLBAR "" 0 20 0 2

 ENDPAGE

-PAGE "Tabella libro unico" -1 -1 78 18
+PAGE "Tabella libro unico pag. 1" -1 -1 78 18

 NUMBER F_ANNO 4
 BEGIN
@ -74,7 +74,7 @@ END

 ENDPAGE

-PAGE "" -1 -1 78 14
+PAGE "Pag. 2" -1 -1 78 14

 LIST F_TIPOA 10
 BEGIN
--- a/ba/ba4100a.uml
+++ b/ba/ba4100a.uml
@ -4,7 +4,7 @@ TOOLBAR "" 0 20 0 2
 #include <toolbar.h>
 ENDPAGE

-PAGE "Tabella Comuni 1/2" -1 -1 77 18
+PAGE "Pag. 1" -1 -1 77 18

 GROUPBOX DLG_NULL 75 4
 BEGIN
@ -243,7 +243,7 @@ END

 ENDPAGE

-PAGE "Tabella Comuni 2/2" -1 -1 77 18
+PAGE "Pag. 2" -1 -1 77 18

 GROUPBOX DLG_NULL 75 4
 BEGIN
--- a/ba/ba4200b.uml
+++ b/ba/ba4200b.uml
@ -3,13 +3,13 @@
 TOOLBAR "" 0 19 0 3


-BUTTON DLG_CHGTIP 21 1
+BUTTON DLG_CHGTIP 25 1
 BEGIN
 PROMPT -13 -3 "Persone Giuridiche"
 MESSAGE K_F10
 END

-BUTTON DLG_DITTE 8 1
+BUTTON DLG_DITTE 10 1
 BEGIN
 PROMPT -36 -3 "Ditte"
 MESSAGE K_F5
@ -105,7 +105,7 @@ BEGIN
 PROMPT 13 5 "Partita IVA "
 END

-LIST FLD_AF1_STATOPAIV 18
+LIST FLD_AF1_STATOPAIV 20
 BEGIN
 PROMPT 14 6 "Stato  "
 FIELD LF_ANAG->STATOPAIV
@ -872,7 +872,7 @@ BEGIN
 PROMPT 36 5 "Eventi di natura eccezionale       "
 HELP "Codice degli eventi di natura eccezionale"
 FIELD LF_ANAG->EVECC
-SHEET "Codice|Descrizione@70"
+SHEET "Codice|Descrizione@50"
 INPUT LST_AF4_EVECC
 OUTPUT LST_AF4_EVECC
 ITEM " |Nessuno"
--- a/ba/ba4200c.uml
+++ b/ba/ba4200c.uml
@ -2,13 +2,13 @@

 TOOLBAR "" 0 19 0 3 

-BUTTON DLG_CHGTIP 21 1
+BUTTON DLG_CHGTIP 25 1
 BEGIN
  PROMPT -13 -3 "Persone Fisiche"
  MESSAGE K_F10
 END

-BUTTON DLG_DITTE 8 1
+BUTTON DLG_DITTE 10 1
 BEGIN
  PROMPT -36 -3 "Ditte"
  MESSAGE K_F5
@ -78,7 +78,7 @@ BEGIN
  PROMPT 0 4 "Partita IVA "
 END

-LIST FLD_AG1_STATOPAIV 18
+LIST FLD_AG1_STATOPAIV 20
 BEGIN
  PROMPT 2 5 "Stato           "
  FIELD LF_ANAG->STATOPAIV
@ -256,7 +256,7 @@ BEGIN
  OUTPUT FLD_AG2_COMRES_COMUNI_DENCOM DENCOM
  OUTPUT FLD_AG2_COMRES_COMUNI_PROVCOM PROVCOM
  OUTPUT FLD_AG2_CAPRES CAPCOM
-  HELP "Codice del comune sede della persoan giuridica"
+  HELP "Codice del comune sede della persona giuridica"
  CHECKTYPE REQUIRED
  WARNING "Comune assente"
  ADD RUN ba4 -0
@ -985,7 +985,7 @@ BEGIN
  PROMPT 37 4 "Eventi di natura eccezionale     "
  FIELD LF_ANAG->EVECC
  HELP "Codice degli eventi naturali eccezionali accaduti alla ditta"
-  SHEET "Codice|Descrizione@70"
+  SHEET "Codice|Descrizione@50"
  INPUT LST_AG5_EVECC
  OUTPUT LST_AG5_EVECC
  ITEM " |Nessuno"
--- a/ba/ba4300a.uml
+++ b/ba/ba4300a.uml
@ -2,25 +2,25 @@

 TOOLBAR "" 0 19 0 3 

-BUTTON DLG_ATT 9 1
+BUTTON DLG_ATT 10 1
 BEGIN
  PROMPT -16 -3 "Attivita'"
  MESSAGE K_F6
 END

-BUTTON DLG_ULC 9 1
+BUTTON DLG_ULC 10 1
 BEGIN
  PROMPT -26 -3 "U.Locali"
  MESSAGE K_F5
 END

-BUTTON DLG_SOC 9 1
+BUTTON DLG_SOC 10 1
 BEGIN
  PROMPT -36 -3 "Soci"
  MESSAGE K_F7
 END

-BUTTON DLG_REG 9 1
+BUTTON DLG_REG 10 1
 BEGIN
  PROMPT -46 -3 "Registri"
  MESSAGE K_F8
@ -29,7 +29,13 @@ END
 #include <toolbar.h>
 ENDPAGE

-PAGE "Ditte 1/4" -1 -1 77 18
+PAGE "Pag. 1" -1 -1 77 18
+
+GROUPBOX DLG_NULL 76 4
+BEGIN
+  PROMPT 0 0 ""
+  FLAGS "R"
+END

 NUMBER FLD_GD1_CODDITTA 5
 BEGIN
@ -100,12 +106,6 @@ BEGIN
  FLAGS "HG"
 END 

-GROUPBOX DLG_NULL 76 4
-BEGIN
-  PROMPT 0 0 ""
-  FLAGS "R"
-END
-
 GROUPBOX DLG_NULL 76 4
 BEGIN
  PROMPT 0 4 "Anagrafica"
@ -225,7 +225,7 @@ END

 ENDPAGE

-PAGE "Ditte 2/4" -1 -1 77 18
+PAGE "Pag. 2" -1 -1 77 18

 GROUPBOX DLG_NULL 76 4
 BEGIN
@ -367,7 +367,7 @@ END

 ENDPAGE

-PAGE "Ditte 3/4" -1 -1 77 18
+PAGE "Pag. 3" -1 -1 77 18

 GROUPBOX DLG_NULL 76 4
 BEGIN
@ -389,7 +389,7 @@ BEGIN
  GROUP 2
 END

-LIST LST_GD2_DATLAV 20
+LIST LST_GD2_DATLAV 22
 BEGIN
  PROMPT 1 4 "Datore lavoro   "
  FIELD LF_NDITTE->DATLAV
@ -556,7 +556,7 @@ END

 ENDPAGE

-PAGE "Ditte 4/4" -1 -1 77 18
+PAGE "Pag. 4" -1 -1 77 18

 GROUPBOX DLG_NULL 76 4
 BEGIN
@ -654,7 +654,7 @@ BEGIN
  HELP "Indicare se i ricavi sono superiore al 20%"
 END

-LIST FLD_GD3_CARRAPP 21
+LIST FLD_GD3_CARRAPP 23
 BEGIN
  PROMPT 1 8 "Carica          "
  FIELD LF_NDITTE->CARRAPP
--- a/ba/ba4400a.uml
+++ b/ba/ba4400a.uml
@ -4,7 +4,7 @@ TOOLBAR "" 0 20 0 2
 #include <toolbar.h>
 ENDPAGE

-PAGE "Unita' locali 1/2" -1 -1 77 18
+PAGE "Pag. 1" -1 -1 77 18

 GROUPBOX DLG_NULL 76 6
 BEGIN
@ -242,7 +242,7 @@ END

 ENDPAGE

-PAGE "Unita' locali 2/2" -1 -1 77 18
+PAGE "Pag. 2" -1 -1 77 18

 GROUPBOX DLG_NULL 76 6
 BEGIN
--- a/ba/ba4500a.uml
+++ b/ba/ba4500a.uml
@ -4,7 +4,13 @@ TOOLBAR "" 0 20 0 2
 #include <toolbar.h>
 ENDPAGE

-PAGE "Attivita' 1/2" -1 -1 77 20
+PAGE "Pag. 1" -1 -1 77 20
+
+GROUPBOX DLG_NULL 76 6
+BEGIN
+  PROMPT 0 0 ""
+  FLAGS "R"
+END

 STRING FLD_AT1_CODDITTA 5
 BEGIN
@ -107,12 +113,6 @@ BEGIN
  HELP "Nome dell'attivita'"
 END

-GROUPBOX DLG_NULL 76 6
-BEGIN
-  PROMPT 0 0 ""
-  FLAGS "R"
-END
-
 NUMBER FLD_AT1_OLDCODATT 4
 BEGIN
  PROMPT 1 6 "Vecchio codice  "
@ -293,7 +293,13 @@ END

 ENDPAGE

-PAGE "Attivita' 2/2" -1 -1 77 20
+PAGE "Pag. 2" -1 -1 77 20
+
+GROUPBOX DLG_NULL 76 6
+BEGIN
+  PROMPT 0 0 ""
+  FLAGS "R"
+END

 STRING DLG_NULL 5
 BEGIN
@ -330,12 +336,6 @@ BEGIN
  GROUP 4
 END

-GROUPBOX DLG_NULL 76 6
-BEGIN
-  PROMPT 0 0 ""
-  FLAGS "R"
-END
-
 TEXT DLG_NULL
 BEGIN
  PROMPT 1 11 "Indirizzo (Solo se diverso)"
@ -346,7 +346,7 @@ BEGIN
  PROMPT 0 6 "Tenuta Registri Contabili"
 END

-LIST LST_AT2_TIPOADS 9
+LIST LST_AT2_TIPOADS 10
 BEGIN
  PROMPT 1 7 "Depositario : Tipo "
  FIELD LF_ATTIV->TIPOADS
--- a/ba/ba4600a.uml
+++ b/ba/ba4600a.uml
@ -4,7 +4,7 @@ TOOLBAR "" 0 20 0 2
 #include <toolbar.h>
 ENDPAGE

-PAGE "Soci 1/2" -1 -1 77 20
+PAGE "Pag.1" -1 -1 77 20

 GROUPBOX DLG_NULL 76 7
 BEGIN
@ -70,7 +70,7 @@ END

 NUMBER FLD_SC1_CODANAGRSOH 5
 BEGIN
-  PROMPT 30 4 "Codice "
+  PROMPT 31 4 "Codice "
  FIELD LF_SOCI->CODANAGRSO
  FLAGS "R"
  KEY 1
@ -98,7 +98,7 @@ END

 NUMBER FLD_SC1_CODANAGRSO 5
 BEGIN
-  PROMPT 30 4 "Codice "
+  PROMPT 31 4 "Codice "
  FIELD LF_SOCI->CODANAGRSO
  FLAGS "RG"
  KEY 1
@ -121,7 +121,7 @@ STRING FLD_SC1_CODANAGR_ANAGR_RAGSOC 50
 BEGIN
  PROMPT 7 5 ": Nome    "
  HELP "Nome dell'anagrafica del socio"
-  KEY 1
+  KEY 2
  USE LF_ANAG KEY 2
  FLAGS "GP"
  INPUT TIPOA LST_SC1_TIPOASOC
@ -179,7 +179,7 @@ END

 NUMBER FLD_SC1_PERCQUAZ 7 3
 BEGIN
-  PROMPT 23 10 "%Proprieta' "
+  PROMPT 26 10 "%Proprieta' "
  FIELD LF_SOCI->PERCQUAZ
  FLAGS "R"
  HELP "Percentuale delle azioni possedute dal socio"
@ -189,7 +189,7 @@ END

 NUMBER FLD_SC1_PERCAZREDD 7 3
 BEGIN
-  PROMPT 45 10 "%Reddito da quota az."
+  PROMPT 50 10 "%Reddito "
  FIELD LF_SOCI->PERCAZREDD
  FLAGS "R"
  HELP "Reddito derivante da quote aziendali"
@ -199,7 +199,7 @@ END

 NUMBER FLD_SC1_PERCAZPERD 7 3
 BEGIN
-  PROMPT 45 11 "%Perdita da quota az."
+  PROMPT 50 11 "%Perdita "
  FIELD LF_SOCI->PERCAZPERD
  FLAGS "R"
  HELP "Perdita derivante da quote aziendali"
@ -244,7 +244,7 @@ END

 LIST LST_SC1_TIPOAZ 1 16
 BEGIN
-  PROMPT 45 14 "Tipo azioni    "
+  PROMPT 47 14 "Tipo azioni "
  FIELD LF_SOCI->TIPOAZ
  ITEM "O|Ordinarie"
  ITEM "P|Privilegiate"
@ -252,6 +252,11 @@ BEGIN
  HELP "Tipo di azioni posseduta dal socio"
 END

+GROUPBOX DLG_NULL 76 3
+BEGIN
+  PROMPT 0 15 "Ultimo aggiornamento"
+END
+
 DATE FLD_SC1_DATAGG
 BEGIN
  PROMPT 1 16 "Data               "
@ -259,11 +264,6 @@ BEGIN
  FLAGS "DA"
 END

-GROUPBOX DLG_NULL 76 3
-BEGIN
-  PROMPT 0 15 "Ultimo aggiornamento"
-END
-
 STRING F_UTENTE 10
 BEGIN
  PROMPT 45 16 "Utente            "
@ -272,7 +272,7 @@ END

 ENDPAGE

-PAGE "Soci 2/2" -1 -1 77 20
+PAGE "Pag. 2" -1 -1 77 20

 GROUPBOX DLG_NULL 76 7
 BEGIN
@ -294,7 +294,7 @@ BEGIN
  GROUP 3
 END

-LIST DLG_NULL 9
+LIST DLG_NULL 12
 BEGIN
  PROMPT 1 4 "Socio : Tipo    "
  FLAGS "D"
@ -314,14 +314,14 @@ END

 NUMBER DLG_NULL 5
 BEGIN
-  PROMPT 30 4 "Codice "
+  PROMPT 31 4 "Codice "
  FLAGS "RD"
  GROUP 5
 END

 STRING DLG_NULL 50
 BEGIN
-  PROMPT 7 5 ": Nome    "
+  PROMPT 9 5 "Nome    "
  FLAGS "D"
  GROUP 6
 END
@ -388,9 +388,14 @@ BEGIN
  NUM_EXPR {(#THIS_FIELD>=0) && (#THIS_FIELD<=12)}
 END

+TEXT DLG_NULL
+BEGIN
+  PROMPT 1 12 "Codice del dichiarante nel caso in cui il socio sia codichiarante"
+END
+
 NUMBER FLD_SC2_CODANAGCON 5
 BEGIN
-  PROMPT 1 12 "Coniuge: Codice "
+  PROMPT 10 14 "Codice "
  FIELD LF_SOCI->CODANAGCON
  FLAGS "R"
  GROUP 1
@ -409,7 +414,7 @@ END

 STRING FLD_SC2_CODANAGCON_ANAFIS_RAGSOC 50
 BEGIN
-  PROMPT 8 13 ": Nome   "
+  PROMPT 10 15 "Nome   "
  HELP "Nome del coniuge del socio"
  USE LF_ANAG KEY 2
  INPUT TIPOA "F"
@ -423,7 +428,7 @@ END

 STRING FLD_SC2_NOTE 60
 BEGIN
-  PROMPT 1 15 "Note        "
+  PROMPT 1 17 "Note        "
  FIELD LF_SOCI->NOTE
  HELP "Eventuali note riferite al socio"
 END
--- a/ba/ba6100b.uml
+++ b/ba/ba6100b.uml
@ -94,17 +94,17 @@ BEGIN
        HELP "Indicare se ritorvare le impostazioni successivamente"
 END

-BUTTON DLG_OK 9 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -13 -1 "Conferma"
 END

-BUTTON DLG_CANCEL 9 2
+BUTTON DLG_CANCEL 10 2
 BEGIN
  PROMPT -23 -1 "Annulla"
 END

-BUTTON BUT_BA6B_RESET 9 2
+BUTTON BUT_BA6B_RESET 10 2
 BEGIN
  PROMPT -33 -1 "~Reset"
 END
--- a/ba/ba6200a.uml
+++ b/ba/ba6200a.uml
@ -1,6 +1,6 @@
 #include "ba6200.h"

-PAGE "" -1 -1 65 16
+PAGE "" -1 -1 67 16

 RADIOBUTTON F_SCELTA 25
 BEGIN
--- a/ba/bastabe.uml
+++ b/ba/bastabe.uml
@ -28,12 +28,12 @@ OUTPUT F_FINE1 CODTAB
 GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
 PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
 PROMPT -22 -1 ""
 END
--- a/ba/bastage.uml
+++ b/ba/bastage.uml
@ -28,12 +28,12 @@ OUTPUT F_FINE1 CODTAB
 GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
 PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
 PROMPT -22 -1 ""
 END
--- a/ba/bastais.uml
+++ b/ba/bastais.uml
@ -29,12 +29,12 @@ BEGIN
  GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/bastasf.uml
+++ b/ba/bastasf.uml
@ -28,12 +28,12 @@ OUTPUT F_FINE1 CODTAB
 GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
 PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
 PROMPT -22 -1 ""
 END
--- a/ba/bastban.uml
+++ b/ba/bastban.uml
@ -57,12 +57,12 @@ BEGIN
  GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/bastcam.uml
+++ b/ba/bastcam.uml
@ -15,7 +15,7 @@ BEGIN
  DISPLAY "Data valuta" D0
  DISPLAY "Descrizione@50" -200->S0
  OUTPUT F_INIZIO1 CODTAB[1,3]
-  OUTPUT F_INIZIO2 CODTAB[4,11]
+  OUTPUT F_INIZIO2 CODTAB[4,14]
  GROUP 1
 END

@ -25,6 +25,7 @@ BEGIN
  HELP "Inserire la data iniziale"
  FIELD LF_TABCOM->CODTAB[4,11]
  COPY ALL F_INIZIO1          
+  FLAGS "R"
  GROUP 1
 END

@ -50,16 +51,17 @@ BEGIN
  PROMPT 28 3 "A data   "
  HELP "Inserire la data finale  "
  FIELD LF_TABCOM->CODTAB[4,11]
+  FLAGS "R"
  COPY ALL F_FINE1
  GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/bastcco.uml
+++ b/ba/bastcco.uml
@ -28,12 +28,12 @@ BEGIN
  GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/bastcfi.uml
+++ b/ba/bastcfi.uml
@ -28,12 +28,12 @@ BEGIN
  GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/bastclr.uml
+++ b/ba/bastclr.uml
@ -76,12 +76,12 @@ BEGIN
  GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/bastcpg.uml
+++ b/ba/bastcpg.uml
@ -29,12 +29,12 @@ BEGIN
  GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/bastcrs.uml
+++ b/ba/bastcrs.uml
@ -29,12 +29,12 @@ BEGIN
  GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/bastctr.uml
+++ b/ba/bastctr.uml
@ -6,7 +6,7 @@ BEGIN
 PROMPT 2 1 "Da codice "
 FLAGS "U"
 HELP "Inserire il codice da cui iniziare la stampa. Se in bianco vuol dire dall'inizio"
-FIELD LF_TABCOM->CODTAB
+FIELD CODTAB
 USE %CTR
 INPUT CODTAB F_INIZIO1
 DISPLAY "Codice" CODTAB
@ -20,7 +20,7 @@ BEGIN
 PROMPT 2 3 "A codice  "
 FLAGS "U"
 HELP "Inserire il codice di fine. Se in bianco vuol dire l'ultimo"
-FIELD LF_TABCOM->CODTAB
+FIELD CODTAB
 COPY USE F_INIZIO1
 INPUT CODTAB F_FINE1
 COPY DISPLAY F_INIZIO1
@ -28,12 +28,12 @@ OUTPUT F_FINE1 CODTAB
 GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
 PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
 PROMPT -22 -1 ""
 END
--- a/ba/bastcve.uml
+++ b/ba/bastcve.uml
@ -6,7 +6,7 @@ BEGIN
  PROMPT 2 1 "Da codice "
  FLAGS "U"
  HELP "Codice da cui iniziare la stampa. Vuoto = inizio archivio"
-        FIELD LF_TABCOM->CODTAB
+  FIELD CODTAB
  USE %CVE
  INPUT CODTAB F_INIZIO1
  DISPLAY "Codice" CODTAB
@ -23,7 +23,7 @@ BEGIN
  PROMPT 2 3 "A codice  "
  FLAGS "U"
  HELP "Codice di fine. Vuoto = fine archivio"
-        FIELD LF_TABCOM->CODTAB
+  FIELD CODTAB
  COPY USE F_INIZIO1
  INPUT CODTAB F_FINE1
  COPY DISPLAY F_INIZIO1
@ -31,12 +31,12 @@ BEGIN
  GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/bastdpn.uml
+++ b/ba/bastdpn.uml
@ -27,12 +27,12 @@ BEGIN
  GROUP 2
 END 

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/bastesc.uml
+++ b/ba/bastesc.uml
@ -36,22 +36,12 @@ BEGIN
  GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -2 ""
 END

-BUTTON DLG_QUIT 8 2
-BEGIN
-	PROMPT -22 -2 ""
-END
-
-BUTTON DLG_OK 8 2
-BEGIN
-	PROMPT -12 -2 ""
-END
-
-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -2 ""
 END
--- a/ba/bastitl.uml
+++ b/ba/bastitl.uml
@ -27,12 +27,12 @@ BEGIN
  GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/bastiva.uml
+++ b/ba/bastiva.uml
@ -31,12 +31,12 @@ BEGIN
  VALIDATE ZEROFILL_FUNC 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/bastleg.uml
+++ b/ba/bastleg.uml
@ -28,12 +28,12 @@ BEGIN
  GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/bastlis.uml
+++ b/ba/bastlis.uml
@ -28,12 +28,12 @@ BEGIN
  GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/bastlng.uml
+++ b/ba/bastlng.uml
@ -27,12 +27,12 @@ BEGIN
  GROUP 2
 END 

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/bastmsp.uml
+++ b/ba/bastmsp.uml
@ -28,12 +28,12 @@ BEGIN
  GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/bastndo.uml
+++ b/ba/bastndo.uml
@ -28,12 +28,12 @@ BEGIN
  GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/bastnot.uml
+++ b/ba/bastnot.uml
@ -30,12 +30,12 @@ BEGIN
  GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/bastois.uml
+++ b/ba/bastois.uml
@ -56,12 +56,12 @@ BEGIN
  GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/bastpor.uml
+++ b/ba/bastpor.uml
@ -28,12 +28,12 @@ BEGIN
  GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/bastreg.uml
+++ b/ba/bastreg.uml
@ -32,31 +32,12 @@ NUMBER F_INIZIO2 4
 BEGIN
  PROMPT 1 4 "Stampa i registri dell'anno "
  FLAGS "RZ"
-//  FLAGS "A"
  FIELD CODTAB[1,4]
  HELP "Stampa i registri dell'anno indicato. Vuoto = tutti i registri"
  MESSAGE COPY, F_FINE2
  GROUP 1
 END 

-/*
-STRING F_INIZIO1 3
-BEGIN
-  PROMPT 19 4 "Da registro   "
-  FLAGS "U"
-  USE REG 
-  INPUT CODTAB[1,4] F_INIZIO2
-  INPUT CODTAB[5,7] F_INIZIO1
-  DISPLAY "Codice" CODTAB[5,7]
-  DISPLAY "Anno" CODTAB[1,4]
-  DISPLAY "Descrizione @50" S0
-  OUTPUT F_INIZIO1 CODTAB[5,7]
-//  OUTPUT F_INIZIO2 CODTAB[1,4]
-  FIELD CODTAB[5,7]
-  GROUP 1
-END 
-
-**************/

 NUMBER F_FINE2 4
 BEGIN
@ -65,23 +46,6 @@ BEGIN
  GROUP 2
 END

-/**********
-STRING F_FINE1 3
-BEGIN
-  PROMPT 44 4 "A registro    "
-  FLAGS "U"
-  USE REG 
-  INPUT CODTAB[1,4] F_FINE2
-  INPUT CODTAB[5,7] F_FINE1
-  DISPLAY "Codice" CODTAB[5,7]
-  DISPLAY "Anno" CODTAB[1,4]
-  DISPLAY "Descrizione @50" S0
-  OUTPUT F_FINE1 CODTAB[5,7]
-//  OUTPUT F_FINE2 CODTAB[1,4]
-  FIELD CODTAB[5,7]
-  GROUP 2
-END 
-*****************/

 BUTTON DLG_PRINT 10 2
 BEGIN 
--- a/ba/bastsad.uml
+++ b/ba/bastsad.uml
@ -28,12 +28,12 @@ BEGIN
  GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/bastscc.uml
+++ b/ba/bastscc.uml
@ -28,12 +28,12 @@ BEGIN
  GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/baststa.uml
+++ b/ba/baststa.uml
@ -29,12 +29,12 @@ BEGIN
  GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/baststt.uml
+++ b/ba/baststt.uml
@ -27,12 +27,12 @@ BEGIN
  GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/bastsua.uml
+++ b/ba/bastsua.uml
@ -61,12 +61,12 @@ BEGIN
  GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/basttit.uml
+++ b/ba/basttit.uml
@ -28,12 +28,12 @@ BEGIN
  GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/basttpd.uml
+++ b/ba/basttpd.uml
@ -27,12 +27,12 @@ BEGIN
  GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/bastucc.uml
+++ b/ba/bastucc.uml
@ -29,12 +29,12 @@ BEGIN
  FLAGS "RZ"
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/bastucs.uml
+++ b/ba/bastucs.uml
@ -29,12 +29,12 @@ BEGIN
  FLAGS "RZ"
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/bastues.uml
+++ b/ba/bastues.uml
@ -29,12 +29,12 @@ BEGIN
  GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/bastuid.uml
+++ b/ba/bastuid.uml
@ -29,12 +29,12 @@ BEGIN
  FLAGS "RZ"
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/bastuiv.uml
+++ b/ba/bastuiv.uml
@ -27,12 +27,12 @@ BEGIN
  FIELD LF_TABCOM->CODTAB
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/basture.uml
+++ b/ba/basture.uml
@ -29,12 +29,12 @@ BEGIN
  GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/bastval.uml
+++ b/ba/bastval.uml
@ -28,12 +28,12 @@ BEGIN
  GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/bastver.uml
+++ b/ba/bastver.uml
@ -52,12 +52,12 @@ BEGIN
  COPY OUTPUT F_FINE1
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -2 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -2 ""
 END
--- a/ba/bastvet.uml
+++ b/ba/bastvet.uml
@ -30,12 +30,12 @@ OUTPUT F_FINE1 CODTAB
 GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
 PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
 PROMPT -22 -1 ""
 END
--- a/ba/bastzon.uml
+++ b/ba/bastzon.uml
@ -28,12 +28,12 @@ BEGIN
  GROUP 2
 END

-BUTTON DLG_OK 8 2
+BUTTON DLG_OK 10 2
 BEGIN
  PROMPT -12 -1 ""
 END

-BUTTON DLG_QUIT 8 2
+BUTTON DLG_QUIT 10 2
 BEGIN
  PROMPT -22 -1 ""
 END
--- a/ba/batbabe.uml
+++ b/ba/batbabe.uml
@ -8,7 +8,7 @@ ENDPAGE

 PAGE "Tabella Aspetto dei Beni" -1 -1 78 8

-STRING F_CODICE 3
+STRING F_CODICE 2
 BEGIN
  PROMPT 4 2 "Codice      "
  FIELD CODTAB
--- a/ba/batbinl.uml
+++ b/ba/batbinl.uml
@ -67,7 +67,7 @@ BEGIN
  FLAGS "D"
 END

-LIST F_MESE 2 12
+LIST F_MESE 2 10
 BEGIN
  PROMPT 40 2 "Mese registrazione "
  FIELD MESEREG
@ -143,7 +143,7 @@ BEGIN
  USE REG KEY 2
  INPUT S0 F_DESCREG
  DISPLAY "Descrizione@50" S0
-  DISPLAY "Codice registro" CODLIB
+  DISPLAY "Codice registro" CODTAB
  COPY OUTPUT F_CODREG
  CHECKTYPE NORMAL
 END
--- a/ba/batbiva.uml
+++ b/ba/batbiva.uml
@ -48,7 +48,7 @@ BEGIN
  WARNING "Manca la descrizione"
 END

-LIST LST_TABIVA_S1 2 22
+LIST LST_TABIVA_S1 2 20
 BEGIN
  PROMPT 3 3 "Tipo codice "
  FIELD S1
@ -115,7 +115,7 @@ BEGIN
  PROMPT 44 5 "Indicatori mod. 101/102"
 END

-LIST FLD_TABIVA_S7 1 26
+LIST FLD_TABIVA_S7 1 24
 BEGIN
  PROMPT 4 6 "Clienti    "
  FIELD S7
@ -125,7 +125,7 @@ BEGIN
  ITEM "3|Non imponibili"
 END

-LIST FLD_TABIVA_S8 1 26
+LIST FLD_TABIVA_S8 1 24
 BEGIN
  PROMPT 4 7 "Fornitori  "
  FIELD S8
@ -150,7 +150,7 @@ BEGIN
  HELP "Indicare se il codice deve comparire nel modello 102"
 END

-LIST FLD_TABIVA_I3 3 6
+LIST FLD_TABIVA_I3 3 4
 BEGIN
  PROMPT 3 10 "Riga vendite IVA11 per op.esenti e non imp.       "
  FIELD I3
@ -161,7 +161,7 @@ BEGIN
  ITEM "3|B3"
 END

-LIST FLD_TABIVA_I4 3 6
+LIST FLD_TABIVA_I4 3 4
 BEGIN
  PROMPT 3 11 "Riga acquisti IVA11 per op.esenti e non imp.      "
  FIELD I4
@ -170,7 +170,7 @@ BEGIN
  ITEM "14|B14"
 END

-LIST LST_TABIVA_S3 1 33
+LIST LST_TABIVA_S3 1 31
 BEGIN
  PROMPT 3 12 "Gestione plafond       "
  FIELD S3
@ -181,7 +181,7 @@ BEGIN
  ITEM "3|Oper. relative art.9"
 END

-LIST LST_TABIVA_S4 1 45
+LIST LST_TABIVA_S4 1 43
 BEGIN
  PROMPT 3 13 "Regime agricolo        "
  FIELD S4
@ -192,7 +192,7 @@ BEGIN
  ITEM "3|Acquisti ad uso promiscuo"
 END

-LIST LST_TABIVA_S5 1 33
+LIST LST_TABIVA_S5 1 31
 BEGIN
  PROMPT 3 14 "Ag. viaggio/turismo    "
  FIELD S5
--- a/ba/batbois.uml
+++ b/ba/batbois.uml
@ -10,7 +10,7 @@ STRING FLD_TABOIS_CODTAB 4
 BEGIN
  PROMPT 2 1 "Codice      "
  FIELD %OIS->CODTAB[1,4]
-	HELP "Codice del vecchio codice attivit…"
+  HELP "Codice del vecchio codice attivita'"
  USE %OIS
  INPUT CODTAB[1,4] FLD_TABOIS_CODTAB
  INPUT CODTAB[5,] FLD_TABOIS_ADD
@ -27,7 +27,7 @@ END
 STRING FLD_TABOIS_ADD 1
 BEGIN
  PROMPT 22 1 "Subcodice   "
-	HELP "Subcodice del vecchio codice attivit…"
+  HELP "Subcodice del vecchio codice attivita'"
  FIELD %OIS->CODTAB[5,]
  COPY ALL FLD_TABOIS_CODTAB
  KEY 1
@ -39,7 +39,7 @@ STRING FLD_TABOIS_S0 40
 BEGIN
  PROMPT 2 3 "Descrizione "
  FIELD %OIS->S0
-	HELP "Descrizione del vecchio codice attivit… "
+  HELP "Descrizione del vecchio codice attivita' "
  USE %OIS KEY 2
  CHECKTYPE REQUIRED
  INPUT S0 FLD_TABOIS_S0
--- a/ba/batbpim.uml
+++ b/ba/batbpim.uml
@ -81,13 +81,13 @@ BEGIN
  FLAGS "UZ"
  USE REG
  CHECKTYPE NORMAL
-  INPUT CODTAB[1,4] F_REGISTRO
-  INPUT CODTAB[5,7] F_ANNO
-  DISPLAY "Codice registro" CODTAB[1,3]
-  DISPLAY "Anno" CODTAB[4,7]
+  INPUT CODTAB[1,4] F_ANNO
+  INPUT CODTAB[5,7] F_REGISTRO
+  DISPLAY "Codice registro" CODTAB[5,7]
+  DISPLAY "Anno" CODTAB[1,4]
  DISPLAY "Descrizione@50" S0
-  OUTPUT F_REGISTRO CODTAB[1,4]
-  OUTPUT F_ANNO CODTAB[5,7]
+  OUTPUT F_ANNO CODTAB[1,4]
+  OUTPUT F_REGISTRO CODTAB[5,7]
  WARNING "Codice registro assente"
  KEY 1
 END
--- a/ba/batbpor.uml
+++ b/ba/batbpor.uml
@ -17,7 +17,7 @@ END
 STRING F_CODICE 3
 BEGIN
 PROMPT 4 2 "Codice      "
-HELP "Codice della modalit… di consegna"
+HELP "Codice della modalita' di consegna"
 FIELD CODTAB
 FLAGS "U"
 KEY 1
@ -33,7 +33,7 @@ END
 STRING F_DESCR 50
 BEGIN
 PROMPT 4 4 "Descrizione "
-HELP "Descrizione della modalit… di consegna"
+HELP "Descrizione della modalita' di consegna"
 FIELD LF_TABCOM->S0
 KEY 2
 USE %POR KEY 2
--- a/ba/batbreg.uml
+++ b/ba/batbreg.uml
@ -7,7 +7,7 @@ TOOLBAR "" 0 20 0 2

 ENDPAGE

-PAGE "Registri" -1 -1 78 18
+PAGE "Pag.1" -1 -1 78 18

 NUMBER F_CODDITTA 5
 BEGIN
@ -101,7 +101,7 @@ BEGIN
  HELP "Codice del libro sociale a cui fa riferimento il registro"
 END

-LIST F_TIPO 1 30
+LIST F_TIPO 1 28
 BEGIN
  PROMPT 30 5 "Tipo "
  HELP "Tipo di registro"
@ -242,7 +242,7 @@ END

 ENDPAGE

-PAGE "Registri pag.2" -1 -1 78 18
+PAGE "Pag.2" -1 -1 78 18

 NUMBER DLG_NULL 5
 BEGIN
--- a/ba/batbtra.uml
+++ b/ba/batbtra.uml
@ -60,7 +60,7 @@ BEGIN
  FLAGS "D"
  END
  
-LIST F_AGGCAUSALI 6
+LIST F_AGGCAUSALI 7
 BEGIN 
  PROMPT 1 6 "Aggiornamento causali gia' presenti                "
  FIELD %TRA->S0
@ -69,7 +69,7 @@ BEGIN
  ITEMS "T|Tutto"
 END

-LIST F_AGGCLIFO 6
+LIST F_AGGCLIFO 7
 BEGIN 
  PROMPT 1 7 "Aggiornamento Clienti/Fornitori gia' presenti      "
  FIELD %TRA->S1
@ -78,7 +78,7 @@ BEGIN
  ITEMS "T|Tutto"
 END

-LIST F_AGGPCON 6
+LIST F_AGGPCON 7
 BEGIN 
  PROMPT 1 8 "Aggiornamento voci Piano dei Conti gia' presenti   "
  FIELD %TRA->S2
@ -87,7 +87,7 @@ BEGIN
  ITEMS "T|Tutto"
 END

-LIST F_AGGIVD 6
+LIST F_AGGIVD 7
 BEGIN 
  PROMPT 1 9 "Aggiornamento classi Piano dei Conti               "
  FIELD %TRA->S3
--- a/ba/batbver.uml
+++ b/ba/batbver.uml
@ -6,7 +6,7 @@ TOOLBAR "" 0 20 0 2

 ENDPAGE

-PAGE "Versamenti ed interessi IVA" -1 -1 78 16
+PAGE "Interessi IVA" -1 -1 78 16

 GROUPBOX DLG_NULL 78 4
 BEGIN
@ -164,7 +164,7 @@ END

 ENDPAGE

-PAGE "" -1 -1 78 16
+PAGE "Versamenti IVA" -1 -1 78 16

 GROUPBOX DLG_NULL 78 4
 BEGIN
--- a/ba/batbvid.uml
+++ b/ba/batbvid.uml
@ -74,7 +74,7 @@ END

 NUMBER F_PAGA 5
 BEGIN
-  PROMPT 30 11 "Alla pagina "
+  PROMPT 32 11 "Alla pagina "
  FIELD I2
  FLAGS "R"
  CHECKTYPE REQUIRED