diff --git a/ba/bolivacf.frm b/ba/bolivacf.frm
index 04503ee37..6db6c32ba 100755
--- a/ba/bolivacf.frm
+++ b/ba/bolivacf.frm
@@ -2,9 +2,11 @@ USE %DEL
 JOIN 9 INTO CODDITTA=CODTAB[1,5]
 JOIN 6 TO 9 INTO TIPOA=TIPOA CODANAGR=CODANAGR
 JOIN 8 TO 9 INTO CODANAGR=CODANAGR
+JOIN 7 TO 9 INTO CODANAGR=CODANAGR
 JOIN 13 TO 8 ALIAS 113 INTO COM=COMNASC
 JOIN 13 TO 6 ALIAS 213 INTO COM=COMRF(COMRES)
 JOIN %UCC TO 213@ ALIAS 14 INTO CODTAB==UFFCONC
+JOIN 13 TO 7 ALIAS 413 INTO COM=COMCOST
 
 END
 DESCRIPTION
@@ -63,42 +65,50 @@ BEGIN
  KEY "TOTALE (in alto)"
  PROMPT 34 2 ""
  GROUP  10
- PICTURE "###.###.###^^^"
+ PICTURE "(*)###.###.###^^^"
 END
 
-NUMERO 6
+NUMERO 6 44 1
 BEGIN
  KEY "TOTALE (in lettere)"
  PROMPT 5 3 ""
  GROUP  10
- PICTURE "LETTERE"
+ PICTURE "(*,*)LETTERE"
 END
 
 STRINGA 7
 BEGIN
  KEY "sul C/C n."
- PROMPT 8 4 ""
+ PROMPT 9 4 ""
  FIELD 14@->S5
 END
 
 STRINGA 8
 BEGIN
  KEY "Concessione di"
- PROMPT 11 5 ""
+ PROMPT 13 5 ""
  FIELD 14@->S0
 END
 
+LISTA 34
+BEGIN
+ KEY "Tipo anagrafica"
+ FIELD 6->TIPOA
+ ITEM "F| " MESSAGE ENABLE,1@|DISABLE,2@
+ ITEM "G| " MESSAGE ENABLE,2@|DISABLE,1@
+END
+
 STRINGA 9
 BEGIN
- KEY "Eseguito da"
+ KEY "Eseguito da (PG)"
  PROMPT 9 6 ""
  GROUP  2
- FIELD 6->RAGSOC[1,22]
+ FIELD 6->RAGSOC[1,38]
 END
 
 STRINGA 10
 BEGIN
- KEY "Eseguito da (PRIMA PARTE)"
+ KEY "Eseguito da (PF PRIMA PARTE)"
  GROUP  1
  MESSAGE COPY,527
  FIELD 6->RAGSOC[1,22]
@@ -106,7 +116,7 @@ END
 
 STRINGA 11
 BEGIN
- KEY "Eseguito da (SECONDA PARTE)"
+ KEY "Eseguito da (PF SECONDA PARTE)"
  GROUP  1
  MESSAGE APPEND,527
  FIELD 6->RAGSOC[31,50]
@@ -114,7 +124,7 @@ END
 
 STRINGA 527
 BEGIN
- KEY "Eseguito da (COMPLETO)"
+ KEY "Eseguito da (PF COMPLETO)"
  PROMPT 9 6 ""
  GROUP  1
 END
@@ -166,14 +176,14 @@ END
 STRINGA 19
 BEGIN
  KEY "DOMICILIO FISCALE: Provincia"
- PROMPT 43 20 ""
+ PROMPT 44 20 ""
  FIELD 213@->PROVCOM
 END
 
 STRINGA 20
 BEGIN
  KEY "DOMICILIO FISCALE: VIA"
- PROMPT 4 22 ""
+ PROMPT 5 22 ""
  FIELD 6->INDRF
  FIELD 6->INDRES
 END
@@ -194,7 +204,7 @@ END
 NUMERO 15
 BEGIN
  KEY "IMPORTO TRIBUTO"
- PROMPT 58 13 ""
+ PROMPT 57 13 ""
  PICTURE "###.###.###^^^"
  FIELD R0
 END
@@ -210,7 +220,7 @@ END
 NUMERO 17
 BEGIN
  KEY "TOTALE (in basso)"
- PROMPT 90 13 ""
+ PROMPT 88 13 ""
  GROUP  10
  PICTURE "###.###.###^^^"
 END
@@ -218,17 +228,17 @@ END
 NUMERO 18
 BEGIN
  KEY "TOTALE (in alto)"
- PROMPT 90 2 ""
+ PROMPT 89 2 ""
  GROUP  10
- PICTURE "###.###.###^^^"
+ PICTURE "(*)###.###.###^^^"
 END
 
-NUMERO 19
+NUMERO 19 44 1
 BEGIN
  KEY "TOTALE (in lettere)"
- PROMPT 62 3 ""
+ PROMPT 60 3 ""
  GROUP  10
- PICTURE "LETTERE"
+ PICTURE "(*,*)LETTERE"
 END
 
 STRINGA 20
@@ -247,15 +257,15 @@ END
 
 STRINGA 22
 BEGIN
- KEY "Eseguito da"
- PROMPT 66 6 ""
+ KEY "Eseguito da (PG)"
+ PROMPT 64 6 ""
  GROUP  2
- FIELD 6->RAGSOC[1,22]
+ FIELD 6->RAGSOC[1,38]
 END
 
 STRINGA 31
 BEGIN
- KEY "Eseguito da (PRIMA PARTE)"
+ KEY "Eseguito da (PF PRIMA PARTE)"
  GROUP  1
  MESSAGE COPY,528
  FIELD 6->RAGSOC[1,22]
@@ -263,7 +273,7 @@ END
 
 STRINGA 32
 BEGIN
- KEY "Eseguito da (SECONDA PARTE)"
+ KEY "Eseguito da (PF SECONDA PARTE)"
  GROUP  1
  MESSAGE APPEND,528
  FIELD 6->RAGSOC[31,50]
@@ -271,8 +281,8 @@ END
 
 STRINGA 528
 BEGIN
- KEY "Eseguito da (COMPLETO)"
- PROMPT 66 6 ""
+ KEY "Eseguito da (PF COMPLETO)"
+ PROMPT 64 6 ""
  GROUP  1
 END
 
@@ -302,6 +312,7 @@ STRINGA 26
 BEGIN
  KEY "PERIODO DI RIFERIMENTO"
  PROMPT 92 11 ""
+ PICTURE "^^@@"
  FIELD CODTAB[6,9]
 END
 
@@ -323,7 +334,7 @@ END
 STRINGA 40
 BEGIN
  KEY "DOMICILIO FISCALE: Provincia"
- PROMPT 100 20 ""
+ PROMPT 99 20 ""
  FIELD 213@->PROVCOM
 END
 
@@ -338,7 +349,7 @@ END
 STRINGA 42
 BEGIN
  KEY "DOMICILIO FISCALE: NUMERO CIVICO"
- PROMPT 101 22 ""
+ PROMPT 99 22 ""
  FIELD 6->CIVRF
  FIELD 6->CIVRES
 END
@@ -348,20 +359,20 @@ BEGIN
  KEY "Terza sezione"
 END
 
-NUMERO 28
+NUMERO 28 58 1
 BEGIN
  KEY "TOTALE (in lettere)"
- PROMPT 120 3 ""
+ PROMPT 117 3 ""
  GROUP  10
- PICTURE "LETTERE"
+ PICTURE "(*,*)LETTERE"
 END
 
 NUMERO 29
 BEGIN
  KEY "TOTALE (in alto)"
- PROMPT 184 3 ""
+ PROMPT 181 3 ""
  GROUP  10
- PICTURE "#  #   #  #  #    #  #  #^^^"
+ PICTURE "(*  )#  #  #   #  #  #   #  #^^^"
 END
 
 STRINGA 30
@@ -378,32 +389,34 @@ BEGIN
  FIELD 14@->S0
 END
 
+STRINGA 53
+BEGIN
+ KEY "Eseguito da (PG)"
+ PROMPT 127 6 ""
+ GROUP  2
+ FIELD 6->RAGSOC
+END
+
 STRINGA 32
 BEGIN
- KEY "Eseguito da (1)"
+ KEY "Eseguito da (PF Prima parte)"
  PROMPT 127 6 ""
+ GROUP 1
  FIELD 6->RAGSOC[1,30]
 END
 
 STRINGA 33
 BEGIN
- KEY "Eseguito da (2)"
+ KEY "Eseguito da (PF Seconda parte)"
  PROMPT 180 6 ""
+ GROUP 1
  FIELD 6->RAGSOC[31,50]
 END
 
-LISTA 34
-BEGIN
- KEY "Tipo anagrafica"
- FIELD 6->TIPOA
- ITEM "F| " MESSAGE ENABLE,1@|DISABLE,2@
- ITEM "G| " MESSAGE ENABLE,2@|DISABLE,1@
-END
-
 DATA 35
 BEGIN
  KEY "DATA DI NASCITA"
- PROMPT 112 8 ""
+ PROMPT 111 8 ""
  GROUP  1
  FLAGS "D"
  PICTURE "#  #^  #  #^ ^   #  #  #"
@@ -411,6 +424,17 @@ BEGIN
  FORMAT "1444-"
 END
 
+DATA 50
+BEGIN
+ KEY "DATA DI COSTITUZIONE (PG)"
+ PROMPT 112 8 ""
+ GROUP  2
+ FLAGS "D"
+ PICTURE "#  #^  #  #^ ^   #  #  #"
+ FIELD 7->DATACOST
+ FORMAT "1444-"
+END
+
 STRINGA 36
 BEGIN
  KEY "COMUNE (o Stato estero) DI NASCITA"
@@ -420,20 +444,39 @@ BEGIN
  FIELD 113@->DENCOM
 END
 
+STRINGA 51
+BEGIN
+ KEY "COMUNE (o Stato estero) DI COSTITUZIONE (PG)"
+ PROMPT 148 8 ""
+ GROUP  2
+ FLAGS "D"
+ FIELD 413@->DENCOM
+END
+
 STRINGA 37
 BEGIN
  KEY "PROV. DI NASCITA (sigla)"
- PROMPT 208 8 ""
+ PROMPT 205 8 ""
  GROUP  1
  FLAGS "D"
  PICTURE "#  #"
  FIELD 113@->PROVCOM
 END
 
+STRINGA 52
+BEGIN
+ KEY "PROV. DI COSTITUZIONE (sigla)"
+ PROMPT 205 8 ""
+ GROUP  2
+ FLAGS "D"
+ PICTURE "#  #"
+ FIELD 413@->PROVCOM
+END
+
 STRINGA 38
 BEGIN
  KEY "SESSO (M o F)"
- PROMPT 217 8 ""
+ PROMPT 214 8 ""
  GROUP  1
  FLAGS "D"
  FIELD 8->SESSO
@@ -457,7 +500,7 @@ END
 STRINGA 41
 BEGIN
  KEY "DOMICILIO FISCALE: NUMERO CIVICO"
- PROMPT 219 10 ""
+ PROMPT 213 10 ""
  FIELD 6->CIVRF
  FIELD 6->CIVRES
 END
@@ -465,7 +508,7 @@ END
 STRINGA 42
 BEGIN
  KEY "CODICE TRIBUTO"
- PROMPT 114 13 ""
+ PROMPT 112 13 ""
  PICTURE "#  #   #  #"
  FIELD S6
 END
@@ -473,16 +516,16 @@ END
 STRINGA 43
 BEGIN
  KEY "PERIODO DI RIFERIMENTO"
- PROMPT 137 13 ""
- PICTURE "^ ^ ^ ^ ^ #"
+ PROMPT 140 13 ""
+ PICTURE "^^#  @"
  FIELD CODTAB[6,9]
 END
 
 NUMERO 44
 BEGIN
  KEY "Codice Concessione"
- PROMPT 156 13 ""
- PICTURE "#  #  #"
+ PROMPT 154 13 ""
+ PICTURE "@  @  @"
  FIELD 6->UFFCONC
  FIELD 14@->CODTAB
 END
@@ -490,43 +533,43 @@ END
 STRINGA 45
 BEGIN
  KEY "Codice fiscale"
- PROMPT 166 13 ""
+ PROMPT 164 13 ""
  GROUP  1
- PICTURE "#  #  #    #  #  #   #  #   #   #   #  #   #  #  #  #"
+ PICTURE "#  #  #   #  #   #  #   #  #   #  #  #   #  #   #  #"
  FIELD 6->COFI
 END
 
 STRINGA 62
 BEGIN
  KEY "Codice fiscale (Persone GIURIDICHE)"
- PROMPT 166 13 ""
+ PROMPT 164 13 ""
  GROUP  2
  FLAGS "D"
- PICTURE "#  #  #    #  #  #   #  #   #   #   #"
+ PICTURE "#  #  #   #  #  #   #  #  #   #  #"
  FIELD 6->COFI
 END
 
 STRINGA 46
 BEGIN
  KEY "Partita IVA"
- PROMPT 184 15 ""
- PICTURE "#  #  #  #  #  #  #  #  #  #  #"
+ PROMPT 181 15 ""
+ PICTURE "#  #   #  #   #  #  #  #   #  #   #"
  FIELD 6->PAIV
 END
 
 NUMERO 47
 BEGIN
  KEY "IMPORTO TRIBUTO"
- PROMPT 184 17 ""
- PICTURE "#  #   #  #  #    #  #  #^^^"
+ PROMPT 181 17 ""
+ PICTURE "(*  )#  #  #   #  #   #  #   #^^^"
  FIELD R0
 END
 
 NUMERO 48
 BEGIN
  KEY "INTERESSI"
- PROMPT 184 19 ""
- PICTURE "#  #   #  #  #    #  #  #^^^"
+ PROMPT 181 19 ""
+ PICTURE "(*  )#  #  #   #  #   #  #   #^^^"
  FIELD R1
 END
 
diff --git a/ba/deliig.frm b/ba/deliig.frm
index 2928fa11a..042532dad 100755
--- a/ba/deliig.frm
+++ b/ba/deliig.frm
@@ -6,13 +6,10 @@ JOIN 13 TO 16@ ALIAS 213 INTO COM=COMRES
 JOIN 6 ALIAS 26 INTO TIPOA=S1[1,1] CODANAGR=S1[2,6]
 JOIN 8 TO 26@ ALIAS 28 INTO CODANAGR=CODANAGR
 JOIN 13 TO 28@ ALIAS 313 INTO COM=COMNASC
+JOIN  7 TO 16@ ALIAS 17 INTO CODANAGR=CODANAGR
 JOIN %BAN ALIAS 14 INTO CODTAB=S7
 JOIN %BAN ALIAS 24 INTO CODTAB=S7+S8
-JOIN %UCS TO 213@ ALIAS 34 INTO CODTAB==UFFCSERV
-JOIN %UID TO 213@ ALIAS 44 INTO CODTAB==UFFIIDD1
-JOIN 13 TO 34@ ALIAS 413 INTO COM=S6
-JOIN 13 TO 44@ ALIAS 513 INTO COM=S5
-
+JOIN 13 TO 17@ ALIAS 413 INTO COM=COMCOST
 END
 DESCRIPTION
 BEGIN
@@ -61,10 +58,20 @@ BEGIN
  KEY "DATI DICHIARANTE (ALIAS 16 e 18)"
 END
 
+LISTA 
+BEGIN
+ KEY "Societa'"
+ PROMPT 93 11 ""
+ FIELD 6->TIPOA
+ ITEM "F| " MESSAGE ENABLE,1@|DISABLE,2@
+ ITEM "G|X" MESSAGE ENABLE,2@|DISABLE,1@
+END
+
 STRINGA 
 BEGIN
  KEY "COGNOME"
  PROMPT 11 11 ""
+ GROUP 1
  FIELD 16@->RAGSOC[1,30]
 END
 
@@ -72,38 +79,51 @@ STRINGA
 BEGIN
  KEY "NOME"
  PROMPT 65 11 ""
+ GROUP 1
  FIELD 16@->RAGSOC[31,0]
 END
 
-LISTA 
+STRINGA 
 BEGIN
- KEY "Societa'"
- PROMPT 93 11 ""
- FIELD 6->TIPOA
- ITEM "F|" 
- ITEM "G|X" 
+ KEY "RAGIONE SOCIALE"
+ PROMPT 11 11 ""
+ GROUP 2
+ FIELD 16@->RAGSOC
 END
 
 DATA 
 BEGIN
  KEY "DATA DI NASCITA"
  PROMPT 99 11 ""
+ GROUP 1
  PICTURE "##^  ##^ ^###"
  FIELD 18@->DATANASC
  FORMAT "1444-"
 END
 
+DATA 
+BEGIN
+ KEY "DATA DI COSTITUZIONE"
+ PROMPT 99 11 ""
+ GROUP 2
+ PICTURE "##^  ##^ ^###"
+ FIELD 17@->DATACOST
+ FORMAT "1444-"
+END
+
 STRINGA 
 BEGIN
  KEY "SESSO (M o F)"
  PROMPT 122 11 ""
+ GROUP 1
  FIELD 18@->SESSO
 END
 
 STRINGA 
 BEGIN
- KEY "STATO CIVILE"
+ KEY "STATO CIVILE" 
  PROMPT 130 11 ""
+ GROUP 1
  FIELD 18@->STATCIV
 END
 
@@ -111,16 +131,34 @@ STRINGA
 BEGIN
  KEY "COMUNE (o Stato estero) DI NASCITA"
  PROMPT 11 13 ""
+ GROUP 1
  FIELD 113@->DENCOM
 END
 
+STRINGA 
+BEGIN
+ KEY "COMUNE (o Stato estero) DI COSTITUZIONE"
+ PROMPT 11 13 ""
+ GROUP 2
+ FIELD 413@->DENCOM
+END
+
 STRINGA 
 BEGIN
  KEY "PROV. DI NASCITA (sigla)"
  PROMPT 74 13 ""
+ GROUP 1
  FIELD 113@->PROVCOM
 END
 
+STRINGA 
+BEGIN
+ KEY "PROV. DI COSTITUZIONE (sigla)"
+ PROMPT 74 13 ""
+ GROUP 2
+ FIELD 413@->PROVCOM
+END
+
 STRINGA 
 BEGIN
  KEY "CODICE FISCALE"
diff --git a/ba/deliircf.frm b/ba/deliircf.frm
index 39f1a2e02..4e088ef66 100755
--- a/ba/deliircf.frm
+++ b/ba/deliircf.frm
@@ -66,10 +66,19 @@ BEGIN
  FIELD 6->COFI
 END
 
+LISTA 8
+BEGIN
+ KEY "Tipo anagrafica"
+ FIELD 6->TIPOA
+ ITEM "F| " MESSAGE ENABLE,1@|DISABLE,2@
+ ITEM "G| " MESSAGE ENABLE,2@|DISABLE,1@
+END
+
 STRINGA 6
 BEGIN
- KEY "COGNOME, DENOMINAZIONE O RAGIONE SOCIALE"
+ KEY "COGNOME"
  PROMPT 11 19 ""
+ GROUP 1
  FIELD 6->RAGSOC[1,30]
 END
 
@@ -77,15 +86,16 @@ STRINGA 7
 BEGIN
  KEY "NOME"
  PROMPT 99 19 ""
+ GROUP 1
  FIELD 6->RAGSOC[31,-1]
 END
 
-LISTA 8
+STRINGA 93
 BEGIN
- KEY "Tipo anagrafica"
- FIELD 6->TIPOA
- ITEM "F| " MESSAGE ENABLE,1@|DISABLE,2@
- ITEM "G| " MESSAGE ENABLE,2@|DISABLE,1@
+ KEY "DENOMINAZIONE O RAGIONE SOCIALE"
+ PROMPT 11 19 ""
+ GROUP 2
+ FIELD 6->RAGSOC
 END
 
 GRUPPO -1
@@ -330,7 +340,7 @@ END
 
 NUMERO 34
 BEGIN
- KEY "IRPEF 3353: TOTALE"
+ KEY "ILOR 3353: TOTALE"
  PROMPT 122 33 ""
  GROUP  6 12
  MESSAGE ADD,9@
@@ -532,7 +542,7 @@ END
 
 NUMERO 55
 BEGIN
- KEY "IRPEF 3110: TOTALE"
+ KEY "ILOR 3110: TOTALE"
  PROMPT 122 41 ""
  GROUP  7 12
  FLAGS "DH"
@@ -704,6 +714,13 @@ BEGIN
  PROMPT 0 0 ""
 END
 
+STRINGA 93
+BEGIN
+ KEY "CODICE TRIBUTO 1"
+ PROMPT 27 53 ""
+ FIELD S3
+END
+
 NUMERO 73
 BEGIN
  KEY "TRIBUTO 1: PERIODO AA (1)"
@@ -745,6 +762,13 @@ BEGIN
  PICTURE "###.###.###^^^"
 END
 
+STRINGA 94
+BEGIN
+ KEY "CODICE TRIBUTO 2"
+ PROMPT 27 55 ""
+ FIELD S4
+END
+
 NUMERO 78
 BEGIN
  KEY "TRIBUTO 2: PERIODO AA (1)"
@@ -786,6 +810,13 @@ BEGIN
  PICTURE "###.###.###^^^"
 END
 
+STRINGA 95
+BEGIN
+ KEY "CODICE TRIBUTO 3"
+ PROMPT 27 57 ""
+ FIELD S5
+END
+
 NUMERO 83
 BEGIN
  KEY "TRIBUTO 3: PERIODO AA (1)"
diff --git a/ba/delirf.frm b/ba/delirf.frm
index f735e6732..a220a5ac2 100755
--- a/ba/delirf.frm
+++ b/ba/delirf.frm
@@ -37,8 +37,8 @@ END
 GENERAL
 BEGIN
   OFFSET 0 0
-  FONT "Courier New"
-  SIZE 7
+  FONT "Roman 17cpi"
+  SIZE 12
 END
 
 SECTION BODY ODD 73
diff --git a/ba/disgen.frm b/ba/disgen.frm
index dc86ff5d9..ff34b3775 100755
--- a/ba/disgen.frm
+++ b/ba/disgen.frm
@@ -317,26 +317,73 @@ BEGIN
 END
 
 STRINGA 35
+BEGIN
+ KEY "CODICE CONTRIBUENTE Dichiarante (Esattoria Prov.)"
+ PROMPT 6 53 ""
+ FIELD 16@->CODCONTR[1,2]
+END
+
+STRINGA 39
+BEGIN
+ KEY "CODICE CONTRIBUENTE Dichiarante (Esattoria Com.)"
+ PROMPT 14 53 ""
+ FIELD 16@->CODCONTR[3,5]
+END
+
+STRINGA 40
 BEGIN
  KEY "CODICE CONTRIBUENTE Dichiarante"
- PROMPT 4 53 "# # # # # # # # # # # # # # # # # # # #"
- PICTURE "###    ##"
- FIELD 16@->CODCONTR
+ PROMPT 30 53 ""
+ FIELD 16@->CODCONTR[6,13]
+END
+
+STRINGA 41
+BEGIN
+ KEY "CODICE CONTRIBUENTE Dichiarante (C.c.)"
+ PROMPT 50 53 ""
+ FIELD 16@->CODCONTR[14,15]
 END
 
 STRINGA 36
+BEGIN
+ KEY "CODICE CONTRIBUENTE Coniuge (Esattoria Prov.)"
+ PROMPT 6 56 ""
+ FIELD 26@->CODCONTR[1,2]
+END
+
+STRINGA 42
+BEGIN
+ KEY "CODICE CONTRIBUENTE Coniuge (Esattoria Com.)"
+ PROMPT 14 56 ""
+ FIELD 26@->CODCONTR[3,5]
+END
+
+STRINGA 43
 BEGIN
  KEY "CODICE CONTRIBUENTE Coniuge"
- PROMPT 4 56 "# # # # # # # # # # # # # # # # # # # #"
- PICTURE "###    ##"
- FIELD 26@->CODCONTR
+ PROMPT 30 56 ""
+ FIELD 26@->CODCONTR[6,13]
+END
+
+STRINGA 44
+BEGIN
+ KEY "CODICE CONTRIBUENTE Coniuge (C.c.)"
+ PROMPT 50 56 ""
+ FIELD 26@->CODCONTR[14,15]
 END
 
 STRINGA 37
 BEGIN
  KEY "CENTRO SERVIZI: Provincia e Denominazione"
  PROMPT 74 56 ""
- MESSAGE _CENSERoUFFIMP,213@,16@
+ MESSAGE _CENSERoUFFIMP,213@,16@,501
+END
+
+STRINGA 501
+BEGIN
+ KEY "CENTRO SERVIZI: Codice"
+ PROMPT 120 56 ""
+ PICTURE "#  #  #"
 END
 
 DATA 38
diff --git a/ba/disiircf.frm b/ba/disiircf.frm
index 8efb9be61..92645d214 100755
--- a/ba/disiircf.frm
+++ b/ba/disiircf.frm
@@ -48,10 +48,19 @@ BEGIN
  FIELD 6->COFI
 END
 
+LISTA 8
+BEGIN
+ KEY "Tipo anagrafica"
+ FIELD 6->TIPOA
+ ITEM "F| " MESSAGE ENABLE,1@|DISABLE,2@
+ ITEM "G| " MESSAGE ENABLE,2@|DISABLE,1@
+END
+
 STRINGA 6
 BEGIN
- KEY "COGNOME, DENOMINAZIONE O RAGIONE SOCIALE"
+ KEY "COGNOME"
  PROMPT 11 16 ""
+ GROUP 1
  FIELD 6->RAGSOC[1,30]
 END
 
@@ -59,15 +68,16 @@ STRINGA 7
 BEGIN
  KEY "NOME"
  PROMPT 98 16 ""
+ GROUP 1
  FIELD 6->RAGSOC[31,-1]
 END
 
-LISTA 8
+STRINGA 91
 BEGIN
- KEY "Tipo anagrafica"
- FIELD 6->TIPOA
- ITEM "F| " MESSAGE ENABLE,1@|DISABLE,2@
- ITEM "G| " MESSAGE ENABLE,2@|DISABLE,1@
+ KEY "DENOMINAZIONE O RAGIONE SOCIALE"
+ PROMPT 11 16 ""
+ GROUP 2
+ FIELD 6->RAGSOC
 END
 
 GRUPPO -1
@@ -311,7 +321,7 @@ END
 
 NUMERO 34
 BEGIN
- KEY "IRPEF 3353: TOTALE"
+ KEY "ILOR 3353: TOTALE"
  PROMPT 123 30 ""
  GROUP  6 12
  MESSAGE ADD,9@
@@ -513,7 +523,7 @@ END
 
 NUMERO 55
 BEGIN
- KEY "IRPEF 3110: TOTALE"
+ KEY "ILOR 3110: TOTALE"
  PROMPT 123 38 ""
  GROUP  7 12
  FLAGS "DH"
@@ -685,6 +695,13 @@ BEGIN
  PROMPT 0 0 ""
 END
 
+STRINGA 91
+BEGIN
+ KEY "CODICE TRIBUTO 1"
+ PROMPT 27 50 ""
+ FIELD S3
+END
+
 NUMERO 73
 BEGIN
  KEY "TRIBUTO 1: PERIODO AA (1)"
@@ -701,7 +718,7 @@ END
 
 NUMERO 75
 BEGIN
- KEY "TRIBUTO 1: "
+ KEY "TRIBUTO 1: IMPORTO "
  PROMPT 68 50 ""
  MESSAGE COPY,14@
  PICTURE "###.###.###^^^"
@@ -726,6 +743,13 @@ BEGIN
  PICTURE "###.###.###^^^"
 END
 
+STRINGA 92
+BEGIN
+ KEY "CODICE TRIBUTO 2"
+ PROMPT 27 52 ""
+ FIELD S4
+END
+
 NUMERO 78
 BEGIN
  KEY "TRIBUTO 2: PERIODO AA (1)"
@@ -767,6 +791,13 @@ BEGIN
  PICTURE "###.###.###^^^"
 END
 
+STRINGA 93
+BEGIN
+ KEY "CODICE TRIBUTO 3"
+ PROMPT 27 54 ""
+ FIELD S5
+END
+
 NUMERO 83
 BEGIN
  KEY "TRIBUTO 3: PERIODO AA (1)"
diff --git a/ba/disirg.frm b/ba/disirg.frm
index 19de268ed..ed16f7f1d 100755
--- a/ba/disirg.frm
+++ b/ba/disirg.frm
@@ -267,11 +267,31 @@ BEGIN
 END
 
 STRINGA 31
+BEGIN
+ KEY "CODICE CONTRIBUENTE (Esattoria Prov.)"
+ PROMPT 4 51 ""
+ FIELD 6->CODCONTR[1,2]
+END
+
+STRINGA 34
+BEGIN
+ KEY "CODICE CONTRIBUENTE (Esattoria Com.)"
+ PROMPT 14 51 ""
+ FIELD 6->CODCONTR[3,5]
+END
+
+STRINGA 35
 BEGIN
  KEY "CODICE CONTRIBUENTE"
- PROMPT 4 51 "# # # # # # # # # # # # # # # # # #"
- PICTURE "# # #   ##"
- FIELD 6->CODCONTR
+ PROMPT 30 51 ""
+ FIELD 6->CODCONTR[6,13]
+END
+
+STRINGA 36
+BEGIN
+ KEY "CODICE CONTRIBUENTE (C.c.)"
+ PROMPT 47 51 ""
+ FIELD 6->CODCONTR[14,15]
 END
 
 STRINGA 32
diff --git a/ba/disivacf.frm b/ba/disivacf.frm
index 0d8659d17..d9eed89d1 100755
--- a/ba/disivacf.frm
+++ b/ba/disivacf.frm
@@ -27,12 +27,12 @@ BEGIN
   SIZE 7
 END
 
-SECTION BODY ODD 64
+SECTION BODY ODD 71
 
 STRINGA 1
 BEGIN
  KEY "CONCESSIONE DI"
- PROMPT 64 5 ""
+ PROMPT 64 4 ""
  FIELD 14@->S0
 END
 
@@ -44,27 +44,6 @@ BEGIN
  FIELD 14@->CODTAB
 END
 
-STRINGA 3
-BEGIN
- KEY "CODICE FISCALE"
- PROMPT 26 11 ""
- FIELD 6->COFI
-END
-
-STRINGA 4
-BEGIN
- KEY "COGNOME, DENOMINAZIONE O RAGIONE SOCIALE"
- PROMPT 4 15 ""
- FIELD 6->RAGSOC[1,30]
-END
-
-STRINGA 5
-BEGIN
- KEY "NOME"
- PROMPT 95 15 ""
- FIELD 6->RAGSOC[31,-1]
-END
-
 LISTA 6
 BEGIN
  KEY "Tipo anagrafica"
@@ -73,6 +52,38 @@ BEGIN
  ITEM "G| " MESSAGE ENABLE,2@|DISABLE,1@
 END
 
+STRINGA 3
+BEGIN
+ KEY "CODICE FISCALE"
+ PROMPT 26 11 ""
+ PICTURE "# # #   # # #   # # # # #   # # # # #"
+ FIELD 6->COFI
+END
+
+STRINGA 4
+BEGIN
+ KEY "COGNOME"
+ PROMPT 3 15 ""
+ GROUP 1
+ FIELD 6->RAGSOC[1,30]
+END
+
+STRINGA 5
+BEGIN
+ KEY "NOME"
+ PROMPT 91 15 ""
+ GROUP 1
+ FIELD 6->RAGSOC[31,-1]
+END
+
+STRINGA 25
+BEGIN
+ KEY "DENOMINAZIONE O RAGIONE SOCIALE"
+ PROMPT 3 15 ""
+ GROUP 2
+ FIELD 6->RAGSOC
+END
+
 GRUPPO 7
 BEGIN
  KEY "Persone fisiche"
@@ -84,7 +95,7 @@ END
 DATA 8
 BEGIN
  KEY "DATA DI NASCITA"
- PROMPT 4 17 ""
+ PROMPT 3 17 ""
  GROUP  1
  FLAGS "DH"
  PICTURE "# # ^ # # ^^ # # #"
@@ -95,18 +106,18 @@ END
 DATA 
 BEGIN
  KEY "DATA DI COSTITUZIONE"
- PROMPT 4 17 ""
+ PROMPT 3 17 ""
  GROUP  2
  FLAGS "DH"
  PICTURE "# # ^ # # ^^ # # #"
- FIELD 7->DATANASC
+ FIELD 7->DATACOST
  FORMAT "1444-"
 END
 
 STRINGA 9
 BEGIN
  KEY "SESSO (M o F)"
- PROMPT 34 17 ""
+ PROMPT 33 17 ""
  GROUP  1
  FLAGS "DH"
  FIELD 8->SESSO
@@ -115,7 +126,7 @@ END
 STRINGA 10
 BEGIN
  KEY "COMUNE (o Stato estero) DI NASCITA"
- PROMPT 42 17 ""
+ PROMPT 41 17 ""
  GROUP  1
  FLAGS "DH"
  FIELD 113@->DENCOM
@@ -124,7 +135,7 @@ END
 STRINGA 
 BEGIN
  KEY "COMUNE (o Stato estero) DI COSTITUZIONE"
- PROMPT 42 17 ""
+ PROMPT 41 17 ""
  GROUP  2
  FLAGS "DH"
  FIELD 413@->DENCOM
@@ -151,7 +162,7 @@ END
 STRINGA 12
 BEGIN
  KEY "DOMICILIO FISCALE: COMUNE"
- PROMPT 14 19 ""
+ PROMPT 13 19 ""
  FIELD 213@->DENCOM
 END
 
@@ -165,7 +176,7 @@ END
 STRINGA 14
 BEGIN
  KEY "DOMICILIO FISCALE: VIA"
- PROMPT 72 19 ""
+ PROMPT 70 19 ""
  FIELD 6->INDRF
  FIELD 6->INDRES
 END
@@ -181,10 +192,18 @@ END
 STRINGA 16
 BEGIN
  KEY "PARTITA IVA"
- PROMPT 25 47 ""
+ PROMPT 25 46 ""
+ PICTURE "# # #   # # #   # # # # #"
  FIELD 6->PAIV
 END
 
+STRINGA 24
+BEGIN
+ KEY "CODICE TRIBUTO"
+ PROMPT 10 51 ""
+ FIELD S6
+END
+
 NUMERO 17
 BEGIN
  KEY "ANNO"
@@ -196,7 +215,7 @@ END
 NUMERO 18
 BEGIN
  KEY "IMPORTO TRIBUTO"
- PROMPT 50 51 ""
+ PROMPT 48 51 ""
  MESSAGE COPY,10@
  PICTURE "###.###.###^^^"
  FIELD R0
@@ -205,7 +224,7 @@ END
 NUMERO 19
 BEGIN
  KEY "INTERESSI"
- PROMPT 76 51 ""
+ PROMPT 74 51 ""
  MESSAGE ADD,10@
  PICTURE "###.###.###^^^"
  FIELD R1
@@ -214,7 +233,7 @@ END
 NUMERO 20
 BEGIN
  KEY "TOTALE"
- PROMPT 115 51 ""
+ PROMPT 111 51 ""
  GROUP  10
  PICTURE "###.###.###^^^"
 END
@@ -222,7 +241,7 @@ END
 NUMERO 21
 BEGIN
  KEY "TOTALE (in lettere)"
- PROMPT 9 55 ""
+ PROMPT 7 55 ""
  GROUP  10
  PICTURE "LETTERE"
 END
@@ -230,7 +249,7 @@ END
 NUMERO 22
 BEGIN
  KEY "TOTALE (in cifre)"
- PROMPT 115 55 ""
+ PROMPT 111 55 ""
  GROUP  10
  PICTURE "###.###.###^^^"
 END
@@ -238,7 +257,7 @@ END
 DATA 23
 BEGIN
  KEY "DATA: giorno - mese - anno"
- PROMPT 22 60 ""
+ PROMPT 21 59 ""
  PICTURE "@@  ^ @@^ ^^@@"
  FIELD D0
  FORMAT "1444-"