diff --git a/cg/deliva.frm b/cg/deliva.frm
index c1fa9a85d..c1437e14b 100755
--- a/cg/deliva.frm
+++ b/cg/deliva.frm
@@ -1,37 +1,60 @@
 USE %DEL
+JOIN %BAN ALIAS 2 INTO CODTAB=S7
 JOIN %BAN ALIAS 1 INTO CODTAB=S7+S8
 JOIN 13 TO 1@ ALIAS 11 INTO COM=S5
 JOIN 9 INTO CODDITTA=CODTAB[1,5]
 JOIN 6 TO 9 INTO TIPOA=TIPOA CODANAGR=CODANAGR
 JOIN 8 TO 6 INTO CODANAGR=CODANAGR
 JOIN 7 TO 6 INTO CODANAGR=CODANAGR
-JOIN 13 TO 6 ALIAS 12 INTO COM=COMRF
+JOIN 13 TO 6 ALIAS 12 INTO COM==COMRF
 JOIN 13 TO 8 ALIAS 13 INTO COM=COMNASC
+
+END
+DESCRIPTION
+BEGIN
+  %DEL->* "DEL"
+  2@->* "BAN"
+  1@->* "BAN"
+  11@->* "Comuni"
+  9->* "Ditte"
+  6->* "Anagrafica persone fisiche e giuridiche"
+  8->* "Anagrafica persone fisiche"
+  7->* "Anagrafica persone giuridiche"
+  12@->* "Comuni"
+  13@->* "Comuni"
 END
 
-SECTION BODY 0 66
-STRINGA
+GENERAL
+BEGIN
+  OFFSET 0 0
+  FONT "Courier New"
+  SIZE 7
+END
+
+SECTION BODY ODD 66
+
+STRINGA 1
 BEGIN
  KEY "Sede Azienda"
- PROMPT 34 10 ""
+ PROMPT 50 10 ""
+ FIELD 2@->S0
+END
+
+STRINGA 2
+BEGIN
+ KEY "Sede Filiale"
+ PROMPT 50 12 ""
  FIELD 1@->S0
 END
 
-STRINGA
-BEGIN
- KEY "Sede Filiale"
- PROMPT 34 12 ""
- FIELD 1@->S1
-END
-
-STRINGA
+STRINGA 3
 BEGIN
  KEY "Provincia Banca"
- PROMPT 73 12 ""
+ PROMPT 129 12 ""
  FIELD 11@->PROVCOM
 END
 
-LISTA
+LISTA 4
 BEGIN
  KEY "Tipo anagrafica"
  FIELD 6->TIPOA
@@ -39,52 +62,52 @@ BEGIN
  ITEM "G| " MESSAGE ENABLE,2@|DISABLE,1@
 END
 
-GRUPPO
+GRUPPO 5
 BEGIN
  KEY "Persone fisiche"
  PROMPT 0 0 ""
  GROUP  1
 END
 
-LISTA
+LISTA 6
 BEGIN
  KEY "Sesso"
- PROMPT 19 20 "X  X"
+ PROMPT 34 19 ""
  GROUP  1
  FIELD 8->SESSO
- ITEM "M| " MESSAGE SHOW,3|HIDE,4
- ITEM "F| " MESSAGE SHOW,4|HIDE,3
+ ITEM "M|X " MESSAGE SHOW,3@|HIDE,4@
+ ITEM "F|   X" MESSAGE SHOW,4@|HIDE,3@
 END
 
-GRUPPO
+GRUPPO 7
 BEGIN
  KEY "Sesso maschile"
  PROMPT 0 0 ""
  GROUP  3
 END
 
-STRINGA
+STRINGA 8
 BEGIN
  KEY "Il sottoscritto"
- PROMPT 2 14 "I              o"
+ PROMPT 6 14 "I                o"
  GROUP  1 3
 END
 
-GRUPPO
+GRUPPO 9
 BEGIN
  KEY "Sesso Femminile"
  PROMPT 0 0 ""
  GROUP  4
 END
 
-STRINGA
+STRINGA 10
 BEGIN
  KEY "La sottoscritta"
- PROMPT 2 14 "  a            a"
+ PROMPT 6 14 "  a              a"
  GROUP  1 4
 END
 
-STRINGA
+STRINGA 11
 BEGIN
  KEY "Cognome"
  PROMPT 5 17 ""
@@ -92,81 +115,83 @@ BEGIN
  FIELD 6->RAGSOC[1,30]
 END
 
-STRINGA
+STRINGA 12
 BEGIN
  KEY "Nome"
- PROMPT 35 17 ""
+ PROMPT 73 17 ""
  GROUP  1
  FIELD 6->RAGSOC[31,-1]
 END
 
-NUMERO
+NUMERO 13
 BEGIN
  KEY "Giorno di nascita"
- PROMPT 1 20 ""
+ PROMPT 5 20 ""
  GROUP  1
- PICTURE "@ @"
+ PICTURE "@  @"
  FIELD 8->DATANASC[1,2]
 END
 
-NUMERO
+NUMERO 14
 BEGIN
  KEY "Mese di nascita"
- PROMPT 5 20 ""
+ PROMPT 12 20 ""
  GROUP  1
- PICTURE "@ @"
+ PICTURE "@  @"
  FIELD 8->DATANASC[4,5]
 END
 
-NUMERO
+NUMERO 15
 BEGIN
  KEY "Anno di nascita"
- PROMPT 9 20 ""
+ PROMPT 19 20 ""
  GROUP  1
- PICTURE "@ @"
+ PICTURE "@  @"
  FIELD 8->DATANASC[9,10]
 END
 
-STRINGA
+STRINGA 16
 BEGIN
  KEY "Comune di nascita"
- PROMPT 30 20 ""
+ PROMPT 53 20 ""
  GROUP  1
  FIELD 13@->DENCOM
 END
 
-STRINGA
+STRINGA 17
 BEGIN
  KEY "Provincia di nascita"
- PROMPT 78 20 ""
+ PROMPT 130 20 ""
  GROUP  1
+ PICTURE "#  #"
  FIELD 13@->PROVCOM
 END
 
-GRUPPO
+GRUPPO 18
 BEGIN
  KEY "Persone giuridiche"
  PROMPT 0 0 ""
  GROUP  2
 END
 
-STRINGA
+STRINGA 19
 BEGIN
  KEY "Ragione Sociale"
- PROMPT 3 24 ""
+ PROMPT 5 24 ""
  GROUP  2
  FIELD 6->RAGSOC
 END
 
-STRINGA
+STRINGA 20
 BEGIN
  KEY "Natura Giuridica"
- PROMPT 77 24 ""
+ PROMPT 130 24 ""
  GROUP  2
+ PICTURE "#  #"
  FIELD 7->NATGIU
 END
 
-STRINGA
+STRINGA 21
 BEGIN
  KEY "Via Indirizzo Fiscale"
  FLAGS "H"
@@ -174,69 +199,81 @@ BEGIN
  FIELD 6->INDRF
 END
 
-STRINGA
+STRINGA 22
 BEGIN
  KEY "Numero Civico Indirizzo Fiscale"
  FLAGS "H"
  MESSAGE APPEND,527
- FIELD 6->INDRF
+ FIELD 6->CIVRF
 END
 
 STRINGA 527 35
 BEGIN
  KEY "Indirizzo Fiscale"
- PROMPT 5 27 ""
+ PROMPT 5 28 ""
 END
 
-STRINGA
+STRINGA 24
 BEGIN
  KEY "CAP fiscale"
- PROMPT 45 27 ""
+ PROMPT 74 28 ""
+ PICTURE "#  #   #   #  #"
  FIELD 6->CAPRF
 END
 
-STRINGA
+STRINGA 25
 BEGIN
  KEY "Comune di residenza fiscale"
- PROMPT 56 27 ""
+ PROMPT 92 28 ""
  FIELD 12@->DENCOM
 END
 
-STRINGA
+STRINGA 26
 BEGIN
  KEY "Provincia di residenza fiscale"
- PROMPT 75 27 ""
+ PROMPT 130 28 ""
+ PICTURE "#  #"
  FIELD 12@->PROVCOM
 END
 
-STRINGA
+STRINGA 27
 BEGIN
  KEY "Partita IVA"
- PROMPT 12 30 ""
- PICTURE "# # # # # # # ^ ^ ^ #"
+ PROMPT 24 33 ""
+ PICTURE "#   #  #   #  #   #  #  ^   ^  ^   #"
  FIELD 6->PAIV
 END
 
-STRINGA
+STRINGA 28
 BEGIN
- KEY "Codice fiscale"
- PROMPT 42 30 ""
- PICTURE "# # # # # # # # # # # # # # # #"
+ KEY "Codice fiscale (P.IVA Persone giuridiche)"
+ PROMPT 79 33 ""
+ GROUP  2
+ PICTURE "#   #  #   #   #   #  #   #  #  #   #"
  FIELD 6->COFI
 END
 
-NUMERO
+STRINGA 29
+BEGIN
+ KEY "Codice fiscale (Persone fisiche)"
+ PROMPT 79 33 ""
+ GROUP  1
+ PICTURE "#   #  #   #   #   #  #   #  #  #   #   #   #  #   #  #"
+ FIELD 6->COFI
+END
+
+NUMERO 29
 BEGIN
  KEY "Anno di versamento"
- PROMPT 40 35 ""
- PICTURE "^ ^ @ @"
+ PROMPT 79 40 ""
+ PICTURE "^ ^ @  @"
  FIELD CODTAB[6,9]
 END
 
-LISTA
+LISTA 30
 BEGIN
  KEY "Periodo di versamento"
- PROMPT 50 35 ""
+ PROMPT 110 40 ""
  FIELD CODTAB[10,11]
  ITEM "01|Gennaio"
  ITEM "02|Febbraio"
@@ -253,104 +290,89 @@ BEGIN
  ITEM "13|Annuale"
 END
 
-LISTA
+LISTA 31
 BEGIN
  KEY "X sul mese"
- PROMPT 40 40 ""
+ PROMPT 64 46 ""
  GROUP  6
  FIELD CODTAB[10,11]
  ITEM "01|X"
- ITEM "02|  X"
- ITEM "03|    X"
- ITEM "04|      X"
- ITEM "05|        X"
- ITEM "06|          X"
- ITEM "07|            X"
- ITEM "08|              X"
- ITEM "09|                X"
- ITEM "10|                  X"
- ITEM "11|                    X"
- ITEM "12|                      X"
- ITEM "13|                        X"
+ ITEM "02|     X"
+ ITEM "03|          X"
+ ITEM "04|               X"
+ ITEM "05|                    X"
+ ITEM "06|                         X"
+ ITEM "07|                              X"
+ ITEM "08|                                   X"
+ ITEM "09|                                        X"
+ ITEM "10|                                             X"
+ ITEM "11|                                                  X"
+ ITEM "12|                                                       X"
+ ITEM "13|                                                            X"
 END
 
-LISTA
+LISTA 32
 BEGIN
  KEY "X sul trimestre"
- PROMPT 4 33 ""
+ PROMPT 9 46 ""
  GROUP  6
  FIELD CODTAB[10,11]
- ITEM "01|X" 
+ ITEM "01|X"
  ITEM "02|X"
- ITEM "03|X" 
- ITEM "04|  X"
- ITEM "05|  X" 
- ITEM "06|  X" 
- ITEM "07|    X"
- ITEM "08|    X" 
- ITEM "09|    X" 
- ITEM "10|      X"
- ITEM "11|      X"
- ITEM "12|      X"
- ITEM "13|        X"
+ ITEM "03|X"
+ ITEM "04|      X"
+ ITEM "05|      X"
+ ITEM "06|      X"
+ ITEM "07|           X"
+ ITEM "08|           X"
+ ITEM "09|           X"
+ ITEM "10|                X"
+ ITEM "11|                X"
+ ITEM "12|                X"
+ ITEM "13|                     X"
 END
 
-NUMERO
+NUMERO 33
 BEGIN
  KEY "Importo in cifre"
- PROMPT 20 52 ""
+ PROMPT 31 51 ""
  PICTURE "###.###.###^^^"
  FIELD R0
 END
 
-NUMERO
+NUMERO 34
 BEGIN
  KEY "Importo in lettere"
- PROMPT 40 52 ""
+ PROMPT 60 51 ""
  PICTURE "LETTERE"
  FIELD R0
 END
 
-NUMERO
+DATA 36
 BEGIN
- KEY "Giorno del versamento"
- PROMPT 30 60 ""
- PICTURE "# #"
+ KEY "Data del versamento"
+ PROMPT 87 58 ""
+ PICTURE "@  @^  @  @^  @  @"
  FIELD D0
+ FORMAT "1442-"
 END
 
-NUMERO
-BEGIN
- KEY "Mese del versamento"
- PROMPT 34 60 ""
- PICTURE "# #"
- FIELD D0
-END
-
-NUMERO
-BEGIN
- KEY "Anno del versamento"
- PROMPT 38 60 ""
- PICTURE "# #"
- FIELD D0
-END
-
-STRINGA
+STRINGA 38
 BEGIN
  KEY "Codice Azienda"
- PROMPT 60 62 ""
+ PROMPT 110 58 ""
+ PICTURE "@ @ @ @"
+ FIELD S7
+END
+
+STRINGA 39
+BEGIN
+ KEY "Codice Filiale"
+ PROMPT 124 58 ""
  PICTURE "@ @ @ @"
  FIELD S8
 END
 
-STRINGA
-BEGIN
- KEY "Codice Filiale"
- PROMPT 70 62 ""
- PICTURE "^ ^ @ @"
- FIELD S8
-END
-
 END
 
 END
diff --git a/cg/delivacf.frm b/cg/delivacf.frm
index b2887152f..0df669925 100755
--- a/cg/delivacf.frm
+++ b/cg/delivacf.frm
@@ -4,45 +4,85 @@ JOIN 6 TO 9 INTO TIPOA=TIPOA CODANAGR=CODANAGR
 JOIN 8 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 %UCC TO 213@ ALIAS 14 INTO CODTAB==UFFCONC
+JOIN %BAN ALIAS 24 INTO CODTAB=S7
+JOIN %BAN ALIAS 34 INTO CODTAB=S7+S8
+JOIN 13 TO 24@ ALIAS 313 INTO COM=S5
 
-SECTION BODY 0 66 0 0
-STRINGA
+END
+DESCRIPTION
 BEGIN
- KEY "CONCESSIONE DI"
- PROMPT 36 5 ""
- FIELD 14@->S0
+  %DEL->* "DEL"
+  9->* "Ditte"
+  6->* "Anagrafica persone fisiche e giuridiche"
+  8->* "Anagrafica persone fisiche"
+  113@->* "Comuni"
+  213@->* "Comuni"
+  14@->* "UCC"
+  24@->* "BAN"
+  34@->* "BAN"
+  313@->* "Comuni"
 END
 
-STRINGA
+GENERAL
+BEGIN
+  OFFSET 0 0
+  FONT "Courier New"
+  SIZE 7
+END
+
+SECTION BODY ODD 66
+
+STRINGA 1
+BEGIN
+ KEY "Azienda di credito"
+ PROMPT 73 6 ""
+ FIELD 24@->S0
+END
+
+STRINGA 2
+BEGIN
+ KEY "Dipendenza"
+ PROMPT 73 8 ""
+ FIELD 34@->S0
+END
+
+STRINGA 3
+BEGIN
+ KEY "PROVINCIA dipendenza"
+ PROMPT 127 8 ""
+ FIELD 313@->PROVCOM
+END
+
+STRINGA 2
 BEGIN
  KEY "COD. CONCESS."
- PROMPT 9 11 ""
+ PROMPT 16 11 ""
  FIELD 14@->CODTAB
 END
 
-STRINGA
+STRINGA 3
 BEGIN
  KEY "CODICE FISCALE"
- PROMPT 15 11 ""
+ PROMPT 26 11 ""
  FIELD 6->COFI
 END
 
-STRINGA
+STRINGA 4
 BEGIN
  KEY "COGNOME, DENOMINAZIONE O RAGIONE SOCIALE"
- PROMPT 2 15 ""
+ PROMPT 4 15 ""
  FIELD 6->RAGSOC[1,30]
 END
 
-STRINGA
+STRINGA 5
 BEGIN
  KEY "NOME"
- PROMPT 54 15 ""
+ PROMPT 95 15 ""
  FIELD 6->RAGSOC[31,-1]
 END
 
-LISTA
+LISTA 6
 BEGIN
  KEY "Tipo anagrafica"
  FIELD 6->TIPOA
@@ -50,139 +90,155 @@ BEGIN
  ITEM "G| " MESSAGE ENABLE,2@|DISABLE,1@
 END
 
-GRUPPO
+GRUPPO 7
 BEGIN
  KEY "Persone fisiche"
  PROMPT 0 0 ""
  GROUP  1
 END
 
-DATA
+DATA 8
 BEGIN
  KEY "DATA DI NASCITA"
- PROMPT 2 17 ""
+ PROMPT 4 17 ""
  GROUP  1
- PICTURE "# # ~ # # ~ ~ # # #"
+ PICTURE "# # ^ # # ^ ^ # # #"
  FIELD 8->DATANASC
+ FORMAT "1444-"
 END
 
-STRINGA
+STRINGA 9
 BEGIN
  KEY "SESSO (M o F)"
- PROMPT 19 17 ""
+ PROMPT 34 17 ""
  GROUP  1
  FIELD 8->SESSO
 END
 
-STRINGA
+STRINGA 10
 BEGIN
  KEY "COMUNE (o Stato estero) DI NASCITA"
- PROMPT 24 17 ""
+ PROMPT 42 17 ""
  GROUP  1
  FIELD 113@->DENCOM
 END
 
-STRINGA
+STRINGA 11
 BEGIN
  KEY "PROV. DI NASCITA (sigla)"
- PROMPT 68 17 ""
+ PROMPT 120 17 ""
  GROUP  1
  FIELD 113@->PROVCOM
 END
 
-STRINGA
+STRINGA 12
 BEGIN
  KEY "DOMICILIO FISCALE: COMUNE"
- PROMPT 8 19 ""
+ PROMPT 14 19 ""
  FIELD 213@->DENCOM
 END
 
-STRINGA
+STRINGA 13
 BEGIN
  KEY "DOMICILIO FISCALE: PROV. (sigla)"
- PROMPT 36 19 ""
+ PROMPT 64 19 ""
  FIELD 213@->PROVCOM
 END
 
-STRINGA
+STRINGA 14
 BEGIN
  KEY "DOMICILIO FISCALE: VIA"
- PROMPT 41 19 ""
+ PROMPT 72 19 ""
  FIELD 6->INDRF
  FIELD 6->INDRES
 END
 
-STRINGA
+STRINGA 15
 BEGIN
  KEY "DOMICILIO FISCALE: NUMERO CIVICO"
- PROMPT 70 19 ""
+ PROMPT 124 19 ""
  FIELD 6->CIVRF
  FIELD 6->CIVRES
 END
 
-STRINGA
+STRINGA 16
 BEGIN
  KEY "PARTITA IVA"
- PROMPT 12 47 ""
+ PROMPT 24 47 ""
  FIELD 6->PAIV
 END
 
-NUMERO
+NUMERO 17
 BEGIN
  KEY "ANNO"
- PROMPT 14 51 ""
- PICTURE "~~@@"
+ PROMPT 25 51 ""
+ PICTURE "^^@@"
  FIELD CODTAB[6,9]
 END
 
-NUMERO
+NUMERO 18
 BEGIN
  KEY "IMPORTO TRIBUTO"
- PROMPT 20 51 ""
+ PROMPT 49 51 ""
  MESSAGE COPY,10@
- PICTURE "###.###.###~~~"
+ PICTURE "###.###.###^^^"
  FIELD R0
 END
 
-NUMERO
+NUMERO 19
 BEGIN
  KEY "INTERESSI"
- PROMPT 40 51 ""
+ PROMPT 75 51 ""
  MESSAGE ADD,10@
- PICTURE "###.###.###~~~"
+ PICTURE "###.###.###^^^"
  FIELD R1
 END
 
-NUMERO
+NUMERO 20
 BEGIN
  KEY "TOTALE"
- PROMPT 54 51 ""
+ PROMPT 114 51 ""
  GROUP  10
- PICTURE "###.###.###~~~"
+ PICTURE "###.###.###^^^"
 END
 
-NUMERO
+NUMERO 21
 BEGIN
  KEY "TOTALE (in lettere)"
- PROMPT 5 55 ""
+ PROMPT 9 55 ""
  GROUP  10
  PICTURE "LETTERE"
 END
 
-NUMERO
+NUMERO 22
 BEGIN
  KEY "TOTALE (in cifre)"
- PROMPT 54 55 ""
+ PROMPT 114 55 ""
  GROUP  10
- PICTURE "###.###.###~~~"
+ PICTURE "###.###.###^^^"
 END
 
-DATA
+DATA 23
 BEGIN
  KEY "DATA: giorno - mese - anno"
- PROMPT 12 60 ""
- PICTURE "@@ ~ @@~~~@@"
+ PROMPT 80 60 ""
+ PICTURE "@  @^  @  @^ ^^@  @"
  FIELD D0
+ FORMAT "1444-"
+END
+
+STRINGA 26
+BEGIN
+ KEY "CODICE AZIENDA"
+ PROMPT 102 60 ""
+ FIELD S7
+END
+
+STRINGA 27
+BEGIN
+ KEY "CODICE DIPENDENZA"
+ PROMPT 120 60 ""
+ FIELD S8
 END
 
 END