diff --git a/ba/ba2100.cpp b/ba/ba2100.cpp index 9edd961e1..ef7beee23 100755 --- a/ba/ba2100.cpp +++ b/ba/ba2100.cpp @@ -373,7 +373,7 @@ bool TForm_editor::ask_profile() } else if (k == K_DEL) { - if (yesno_box("Confermare la cancellazione del profilo %05ld", fcode)) + if (fcode != 0 && yesno_box("Confermare la cancellazione del profilo %05ld", fcode)) { TLocalisamfile frm(LF_FORM); frm.zero(); diff --git a/ba/boliircf.frm b/ba/boliircf.frm index 85a09f98a..ca0fe69ee 100755 --- a/ba/boliircf.frm +++ b/ba/boliircf.frm @@ -132,12 +132,10 @@ BEGIN GROUP 1 END -NUMERO 10 +STRINGA 10 BEGIN KEY "Codice Concessione" PROMPT 17 8 "" - PICTURE "@ @ @" - FIELD 6->UFFCONC FIELD 14@->CODTAB END @@ -290,12 +288,10 @@ BEGIN GROUP 1 END -NUMERO 23 +STRINGA 23 BEGIN KEY "Codice Concessione" PROMPT 71 8 "" - PICTURE "@ @ @" - FIELD 6->UFFCONC FIELD 14@->CODTAB END @@ -451,7 +447,7 @@ END STRINGA 51 BEGIN - KEY "COMUNE (o Stato estero) DI COSTITUZIONE (PG)" + KEY "COMUNE DI COSTITUZIONE" PROMPT 151 7 "" GROUP 2 FLAGS "D" @@ -526,12 +522,11 @@ BEGIN FIELD S2 END -NUMERO 44 +STRINGA 44 BEGIN KEY "Codice Concessione" PROMPT 157 12 "" - PICTURE "# # #" - FIELD 6->UFFCONC + PICTURE "@ @ @" FIELD 14@->CODTAB END diff --git a/ba/bolivacf.frm b/ba/bolivacf.frm index 34886e9b5..15f443d1e 100755 --- a/ba/bolivacf.frm +++ b/ba/bolivacf.frm @@ -132,12 +132,10 @@ BEGIN GROUP 1 END -NUMERO 10 +STRINGA 10 BEGIN KEY "Codice Concessione" PROMPT 17 8 "" - PICTURE "@ @ @" - FIELD 6->UFFCONC FIELD 14@->CODTAB END @@ -290,12 +288,10 @@ BEGIN GROUP 1 END -NUMERO 23 +STRINGA 23 BEGIN KEY "Codice Concessione" PROMPT 71 8 "" - PICTURE "@ @ @" - FIELD 6->UFFCONC FIELD 14@->CODTAB END @@ -451,7 +447,7 @@ END STRINGA 51 BEGIN - KEY "COMUNE (o Stato estero) DI COSTITUZIONE (PG)" + KEY "COMUNE DI COSTITUZIONE" PROMPT 151 7 "" GROUP 2 FLAGS "D" @@ -526,12 +522,11 @@ BEGIN FIELD CODTAB[6,9] END -NUMERO 44 +STRINGA 44 BEGIN KEY "Codice Concessione" PROMPT 157 12 "" PICTURE "@ @ @" - FIELD 6->UFFCONC FIELD 14@->CODTAB END diff --git a/ba/deliig.frm b/ba/deliig.frm index ae0b10ea2..b0b846646 100755 --- a/ba/deliig.frm +++ b/ba/deliig.frm @@ -29,8 +29,8 @@ BEGIN FONT "Roman 17cpi" SIZE 12 CARTATTERE "X" - INIZIALE 4 2 - FINALE 79 + INIZIALE 2 2 + FINALE 131 END SECTION BODY ODD 71 @@ -38,21 +38,21 @@ SECTION BODY ODD 71 STRINGA 1 BEGIN KEY "Azienda di credito" - PROMPT 72 2 "" + PROMPT 72 4 "" FIELD 14@->S0 END STRINGA 2 BEGIN KEY "Dipendenza" - PROMPT 72 4 "" + PROMPT 72 6 "" FIELD 24@->S0 END STRINGA 3 BEGIN KEY "PROVINCIA Dipendenza" - PROMPT 129 4 "" + PROMPT 129 6 "" FIELD 313@->PROVCOM END @@ -64,7 +64,7 @@ END LISTA 5 BEGIN KEY "Societa'" - PROMPT 93 7 "" + PROMPT 93 9 "" FIELD 6->TIPOA ITEM "F| " MESSAGE ENABLE,1@|DISABLE,2@ ITEM "G|X" MESSAGE ENABLE,2@|DISABLE,1@ @@ -73,7 +73,7 @@ END STRINGA 6 BEGIN KEY "COGNOME" - PROMPT 11 7 "" + PROMPT 11 9 "" GROUP 1 FIELD 16@->RAGSOC[1,30] END @@ -81,7 +81,7 @@ END STRINGA 7 BEGIN KEY "NOME" - PROMPT 65 7 "" + PROMPT 65 9 "" GROUP 1 FIELD 16@->RAGSOC[31,0] END @@ -89,7 +89,7 @@ END STRINGA 8 BEGIN KEY "RAGIONE SOCIALE" - PROMPT 11 7 "" + PROMPT 11 9 "" GROUP 2 FIELD 16@->RAGSOC END @@ -97,7 +97,7 @@ END DATA 9 BEGIN KEY "DATA DI NASCITA" - PROMPT 99 7 "" + PROMPT 99 9 "" GROUP 1 PICTURE "##^ ##^ ^###" FIELD 18@->DATANASC @@ -107,7 +107,7 @@ END DATA 10 BEGIN KEY "DATA DI COSTITUZIONE" - PROMPT 99 7 "" + PROMPT 99 9 "" GROUP 2 PICTURE "##^ ##^ ^###" FIELD 17@->DATACOST @@ -117,7 +117,7 @@ END STRINGA 11 BEGIN KEY "SESSO (M o F)" - PROMPT 122 7 "" + PROMPT 122 9 "" GROUP 1 FIELD 18@->SESSO END @@ -125,7 +125,7 @@ END STRINGA 12 BEGIN KEY "STATO CIVILE" - PROMPT 130 7 "" + PROMPT 130 9 "" GROUP 1 FIELD 18@->STATCIV END @@ -133,7 +133,7 @@ END STRINGA 13 BEGIN KEY "COMUNE (o Stato estero) DI NASCITA" - PROMPT 11 9 "" + PROMPT 11 11 "" GROUP 1 FIELD 113@->DENCOM END @@ -141,7 +141,7 @@ END STRINGA 14 BEGIN KEY "COMUNE (o Stato estero) DI COSTITUZIONE" - PROMPT 11 9 "" + PROMPT 11 11 "" GROUP 2 FIELD 413@->DENCOM END @@ -149,7 +149,7 @@ END STRINGA 15 BEGIN KEY "PROV. DI NASCITA (sigla)" - PROMPT 74 9 "" + PROMPT 74 11 "" GROUP 1 FIELD 113@->PROVCOM END @@ -157,7 +157,7 @@ END STRINGA 16 BEGIN KEY "PROV. DI COSTITUZIONE (sigla)" - PROMPT 74 9 "" + PROMPT 74 11 "" GROUP 2 FIELD 413@->PROVCOM END @@ -165,7 +165,7 @@ END STRINGA 17 BEGIN KEY "CODICE FISCALE" - PROMPT 83 9 "" + PROMPT 83 11 "" PICTURE "# # # # # # # # # # # # # # # #" FIELD 16@->COFI END @@ -173,28 +173,28 @@ END STRINGA 18 BEGIN KEY "RESIDENTE IN: COMUNE" - PROMPT 28 11 "" + PROMPT 28 13 "" FIELD 213@->DENCOM END STRINGA 19 BEGIN KEY "RESIDENTE IN: PROV. (sigla)" - PROMPT 74 11 "" + PROMPT 74 13 "" FIELD 213@->PROVCOM END STRINGA 20 BEGIN KEY "RESIDENTE IN: VIA" - PROMPT 83 11 "" + PROMPT 83 13 "" FIELD 16@->INDRES END STRINGA 21 BEGIN KEY "RESIDENTE IN: NUMERO CIVICO" - PROMPT 131 11 "" + PROMPT 131 13 "" FIELD 16@->CIVRES END @@ -206,7 +206,7 @@ END STRINGA 23 BEGIN KEY "COGNOME" - PROMPT 11 14 "" + PROMPT 11 16 "" GROUP 1 FIELD 26@->RAGSOC[1,30] END @@ -214,7 +214,7 @@ END STRINGA 24 BEGIN KEY "NOME" - PROMPT 65 14 "" + PROMPT 65 16 "" GROUP 1 FIELD 26@->RAGSOC[31,0] END @@ -222,7 +222,7 @@ END DATA 25 BEGIN KEY "DATA DI NASCITA" - PROMPT 108 14 "" + PROMPT 108 16 "" GROUP 1 PICTURE "##^ ##^ ^###" FIELD 28@->DATANASC @@ -232,7 +232,7 @@ END STRINGA 26 BEGIN KEY "SESSO (M o F)" - PROMPT 130 14 "" + PROMPT 130 16 "" GROUP 1 FIELD 28@->SESSO END @@ -240,7 +240,7 @@ END STRINGA 27 BEGIN KEY "COMUNE (o Stato estero) DI NASCITA" - PROMPT 11 16 "" + PROMPT 11 18 "" GROUP 1 FIELD 313@->DENCOM END @@ -248,7 +248,7 @@ END STRINGA 28 BEGIN KEY "PROV. DI NASCITA (sigla)" - PROMPT 74 16 "" + PROMPT 74 18 "" GROUP 1 FIELD 313@->PROVCOM END @@ -256,7 +256,7 @@ END STRINGA 29 BEGIN KEY "CODICE FISCALE" - PROMPT 83 16 "" + PROMPT 83 18 "" GROUP 1 PICTURE "# # # # # # # # # # # # # # # #" FIELD 26@->COFI @@ -271,7 +271,7 @@ END NUMERO 30 BEGIN KEY "Anno di riferimento (saldo IRPEF)" - PROMPT 64 20 "" + PROMPT 64 22 "" PICTURE "# #" FIELD I0 END @@ -279,16 +279,23 @@ END NUMERO 31 BEGIN KEY "Importo saldo IRPEF" - PROMPT 87 20 "" + PROMPT 87 22 "" MESSAGE ADD,5@ PICTURE "###.###.###^^^" + MESSAGE EMPTY HIDE,79 FIELD R0 END +STRINGA 79 +BEGIN + KEY "X su SALDO-IRPEF" + PROMPT 41 22 "X" +END + NUMERO 32 BEGIN KEY "Anno di riferimento (acconto IRPEF)" - PROMPT 64 22 "" + PROMPT 64 24 "" PICTURE "# #" FIELD I1 END @@ -296,16 +303,23 @@ END NUMERO 33 BEGIN KEY "Importo acconto IRPEF" - PROMPT 87 22 "" + PROMPT 87 24 "" MESSAGE ADD,5@ PICTURE "###.###.###^^^" + MESSAGE EMPTY HIDE,80 FIELD R1 END +STRINGA 80 +BEGIN + KEY "X su ACCONTO-IRPEF" + PROMPT 41 24 "X" +END + NUMBER 34 BEGIN KEY "Anno di rif. (saldo ILOR dich.)" - PROMPT 64 24 "" + PROMPT 64 26 "" PICTURE "# #" FIELD I2 END @@ -313,16 +327,23 @@ END NUMERO 35 BEGIN KEY "Importo saldo ILOR dichiarante" - PROMPT 87 24 "" + PROMPT 87 26 "" MESSAGE ADD,5@ PICTURE "###.###.###^^^" + MESSAGE EMPTY HIDE,81 FIELD R2 END +STRINGA 81 +BEGIN + KEY "X su SALDO-ILOR" + PROMPT 41 26 "X" +END + NUMERO 36 BEGIN KEY "Anno di rif. (acconto ILOR dich.)" - PROMPT 64 26 "" + PROMPT 64 28 "" PICTURE "# #" FIELD I3 END @@ -330,16 +351,23 @@ END NUMERO 37 BEGIN KEY "Importo acconto ILOR dichiarante" - PROMPT 87 26 "" + PROMPT 87 28 "" MESSAGE ADD,5@ PICTURE "###.###.###^^^" + MESSAGE EMPTY HIDE,82 FIELD R3 END +STRINGA 82 +BEGIN + KEY "X su ACCONTO-ILOR" + PROMPT 41 28 "X" +END + NUMERO 38 BEGIN KEY "Anno di rif. (saldo SSN dich.)" - PROMPT 64 28 "" + PROMPT 64 30 "" PICTURE "# #" FIELD I4 END @@ -347,16 +375,23 @@ END NUMERO 39 BEGIN KEY "Importo saldo SSN dichiarante" - PROMPT 87 28 "" + PROMPT 87 30 "" MESSAGE ADD,5@ PICTURE "###.###.###^^^" + MESSAGE EMPTY HIDE,83 FIELD R4 END +STRINGA 83 +BEGIN + KEY "X su SALDO-SSN" + PROMPT 41 30 "X" +END + NUMERO 40 BEGIN KEY "Anno di rif. (acconto SSN dich.)" - PROMPT 64 30 "" + PROMPT 64 32 "" PICTURE "# #" FIELD I5 END @@ -364,16 +399,23 @@ END NUMERO 41 BEGIN KEY "Importo acconto SSN dichiarante" - PROMPT 87 30 "" + PROMPT 87 32 "" MESSAGE ADD,5@ PICTURE "###.###.###^^^" + MESSAGE EMPTY HIDE,84 FIELD R5 END +STRINGA 84 +BEGIN + KEY "X su ACCONTO-SSN" + PROMPT 41 32 "X" +END + STRING 42 BEGIN KEY "Codice regione SSN dichiarante" - PROMPT 112 29 "" + PROMPT 112 31 "" PICTURE "# #" FIELD S6 END @@ -381,7 +423,7 @@ END NUMERO 43 BEGIN KEY "Anno di rif. (saldo ILOR coniuge)" - PROMPT 64 32 "" + PROMPT 64 34 "" PICTURE "# #" FIELD I6 END @@ -389,16 +431,23 @@ END NUMERO 44 BEGIN KEY "Importo saldo ILOR coniuge" - PROMPT 87 32 "" + PROMPT 87 34 "" MESSAGE ADD,5@ PICTURE "###.###.###^^^" + MESSAGE EMPTY HIDE,85 FIELD R6 END +STRINGA 85 +BEGIN + KEY "X su SALDO-ILOR (coniuge)" + PROMPT 41 34 "X" +END + NUMERO 45 BEGIN KEY "Anno di rif. (acc. ILOR coniuge)" - PROMPT 64 34 "" + PROMPT 64 36 "" PICTURE "# #" FIELD I7 END @@ -406,16 +455,23 @@ END NUMERO 46 BEGIN KEY "Importo acconto ILOR coniuge" - PROMPT 87 34 "" + PROMPT 87 36 "" MESSAGE ADD,5@ PICTURE "###.###.###^^^" + MESSAGE EMPTY HIDE,86 FIELD R7 END +STRINGA 86 +BEGIN + KEY "X su ACCONTO-ILOR (coniuge)" + PROMPT 41 36 "X" +END + NUMERO 47 BEGIN KEY "Anno di rif. (saldo SSN coniuge)" - PROMPT 64 36 "" + PROMPT 64 38 "" PICTURE "# #" FIELD I8 END @@ -423,16 +479,23 @@ END NUMERO 48 BEGIN KEY "Importo saldo SSN coniuge" - PROMPT 87 36 "" + PROMPT 87 38 "" MESSAGE ADD,5@ PICTURE "###.###.###^^^" + MESSAGE EMPTY HIDE,87 FIELD R8 END +STRINGA 87 +BEGIN + KEY "X su SALDO-SSN (coniuge)" + PROMPT 41 38 "X" +END + NUMERO 49 BEGIN KEY "Anno di rif. (acc. SSN coniuge)" - PROMPT 64 38 "" + PROMPT 64 40 "" PICTURE "# #" FIELD I9 END @@ -440,16 +503,23 @@ END NUMERO 50 BEGIN KEY "Importo acconto SSN coniuge" - PROMPT 87 38 "" + PROMPT 87 40 "" MESSAGE ADD,5@ PICTURE "###.###.###^^^" + MESSAGE EMPTY HIDE,88 FIELD R9 END +STRINGA 88 +BEGIN + KEY "X su ACCONTO-SSN (coniuge)" + PROMPT 41 40 "X" +END + STRING 51 BEGIN KEY "Codice regione SSN coniuge" - PROMPT 112 37 "" + PROMPT 112 39 "" PICTURE "# #" FIELD S9 END @@ -457,7 +527,7 @@ END STRINGA 52 BEGIN KEY "Centro di serv. o Uff. imp. dir." - PROMPT 61 40 "" + PROMPT 61 42 "" PICTURE "# # #" FIELD 213@->UFFCSERV FIELD 213@->UFFIIDD1 @@ -466,21 +536,21 @@ END STRING 53 BEGIN KEY "Intestatario tributo (1)" - PROMPT 34 45 "" + PROMPT 34 47 "" FIELD S2[5,5] END STRING 54 BEGIN KEY "Codice tributo (1)" - PROMPT 42 45 "" + PROMPT 42 47 "" FIELD S2[1,4] END STRING 55 BEGIN KEY "Codice regione tributo (1)" - PROMPT 112 45 "" + PROMPT 112 47 "" PICTURE "# #" FIELD S2[6,7] END @@ -488,7 +558,7 @@ END NUMERO 56 BEGIN KEY "Anno di riferimento tributo (1)" - PROMPT 64 45 "" + PROMPT 64 47 "" PICTURE "# #" FIELD I10 END @@ -496,7 +566,7 @@ END NUMERO 57 BEGIN KEY "Importo tributo (1)" - PROMPT 87 45 "" + PROMPT 87 47 "" MESSAGE ADD,5@ PICTURE "###.###.###^^^" FIELD R10 @@ -505,21 +575,21 @@ END STRING 58 BEGIN KEY "Intestatario tributo (2)" - PROMPT 34 47 "" + PROMPT 34 49 "" FIELD S3[5,5] END STRING 59 BEGIN KEY "Codice tributo (2)" - PROMPT 42 47 "" + PROMPT 42 49 "" FIELD S3[1,4] END STRING 60 BEGIN KEY "Codice regione tributo (2)" - PROMPT 112 47 "" + PROMPT 112 49 "" PICTURE "# #" FIELD S3[6,7] END @@ -527,7 +597,7 @@ END NUMERO 61 BEGIN KEY "Anno di riferimento tributo (2)" - PROMPT 64 47 "" + PROMPT 64 49 "" PICTURE "# #" FIELD I11 END @@ -535,7 +605,7 @@ END NUMERO 62 BEGIN KEY "Importo tributo (2)" - PROMPT 87 47 "" + PROMPT 87 49 "" MESSAGE ADD,5@ PICTURE "###.###.###^^^" FIELD R11 @@ -544,21 +614,21 @@ END STRING 63 BEGIN KEY "Intestatario tributo (3)" - PROMPT 34 49 "" + PROMPT 34 51 "" FIELD S4[5,5] END STRING 64 BEGIN KEY "Codice tributo (3)" - PROMPT 42 49 "" + PROMPT 42 51 "" FIELD S4[1,4] END STRING 65 BEGIN KEY "Codice regione tributo (3)" - PROMPT 112 49 "" + PROMPT 112 51 "" PICTURE "# #" FIELD S4[6,7] END @@ -566,7 +636,7 @@ END NUMERO 66 BEGIN KEY "Anno di riferimento tributo (3)" - PROMPT 64 49 "" + PROMPT 64 51 "" PICTURE "# #" FIELD I12 END @@ -574,7 +644,7 @@ END NUMERO 67 BEGIN KEY "Importo tributo (3)" - PROMPT 87 49 "" + PROMPT 87 51 "" MESSAGE ADD,5@ PICTURE "###.###.###^^^" FIELD R12 @@ -583,21 +653,21 @@ END STRING 68 BEGIN KEY "Intestatario tributo (4)" - PROMPT 34 51 "" + PROMPT 34 53 "" FIELD S5[5,5] END STRING 69 BEGIN KEY "Codice tributo (4)" - PROMPT 42 51 "" + PROMPT 42 53 "" FIELD S5[1,4] END STRING 70 BEGIN KEY "Codice regione tributo (4)" - PROMPT 112 51 "" + PROMPT 112 53 "" PICTURE "# #" FIELD S5[6,7] END @@ -605,7 +675,7 @@ END NUMERO 71 BEGIN KEY "Anno di riferimento tributo (4)" - PROMPT 64 51 "" + PROMPT 64 53 "" PICTURE "# #" FIELD I13 END @@ -613,7 +683,7 @@ END NUMERO 72 BEGIN KEY "Importo tributo (4)" - PROMPT 87 51 "" + PROMPT 87 53 "" MESSAGE ADD,5@ PICTURE "###.###.###^^^" FIELD R13 @@ -622,7 +692,7 @@ END NUMERO 73 BEGIN KEY "TOTALE (in cifre)" - PROMPT 87 54 "" + PROMPT 87 56 "" GROUP 5 PICTURE "###.###.###^^^" END @@ -630,7 +700,7 @@ END NUMERO 75 BEGIN KEY "TOTALE (in lettere)" - PROMPT 20 57 "" + PROMPT 20 59 "" GROUP 5 PICTURE "LETTERE" END @@ -638,7 +708,7 @@ END DATA 76 BEGIN KEY "DATA: giorno - mese - anno" - PROMPT 81 62 "" + PROMPT 81 64 "" PICTURE "@ @^ @ @^^^@ @" FIELD D0 FORMAT "1444-" @@ -647,14 +717,14 @@ END STRINGA 77 BEGIN KEY "CODICE AZIENDA" - PROMPT 102 62 "" + PROMPT 102 64 "" FIELD S7 END -STRINGA +STRINGA 78 BEGIN KEY "CODICE DIPENDENZA" - PROMPT 120 62 "" + PROMPT 120 64 "" FIELD S8 END