diff --git a/ba/ba1100d.uml b/ba/ba1100d.uml index 74ecf5e86..1fd4424d6 100755 --- a/ba/ba1100d.uml +++ b/ba/ba1100d.uml @@ -48,9 +48,9 @@ BEGIN FLAGS "D" END -SPREADSHEET F_FIELDS 44 7 +SPREADSHEET F_FIELDS 0 7 BEGIN - PROMPT 15 4 "" + PROMPT 1 4 "" ITEM "Nome@10" ITEM "Tipo" ITEM "Lunghezza" diff --git a/ba/ba2.h b/ba/ba2.h index 70012d9a7..6c46bc821 100755 --- a/ba/ba2.h +++ b/ba/ba2.h @@ -4,6 +4,7 @@ int ba2100(int argc, char* argv[]); int ba2200(int argc, char* argv[]); int ba2300(int argc, char* argv[]); +int ba2400(int argc, char* argv[]); #endif // __BA2_H diff --git a/ba/ba2.url b/ba/ba2.url index 95fb1c5ab..8d206b362 100755 --- a/ba/ba2.url +++ b/ba/ba2.url @@ -54,3 +54,9 @@ MENUBAR MENU_BAR(2) MENU MENU_BAR(2) SUBMENU MENU_FILE "~File" + +MENUBAR MENU_BAR(3) + +MENU MENU_BAR(3) + SUBMENU MENU_FILE "~File" + diff --git a/ba/ba2100.h b/ba/ba2100.h index db6813d51..45ff40eca 100755 --- a/ba/ba2100.h +++ b/ba/ba2100.h @@ -24,6 +24,20 @@ #define F_GROUP10 140 #define F_GROUP11 141 #define F_GROUP12 142 +#define F_GROUP13 143 +#define F_GROUP14 144 +#define F_GROUP15 145 +#define F_GROUP16 146 +#define F_GROUP17 147 +#define F_GROUP18 148 +#define F_GROUP19 149 +#define F_GROUP20 150 +#define F_GROUP21 151 +#define F_GROUP22 152 +#define F_GROUP23 153 +#define F_GROUP24 154 + + #define F_ITEMS 200 #define F_DECIMALS 206 diff --git a/ba/ba2100f.uml b/ba/ba2100f.uml index a88304a2c..255e795c7 100755 --- a/ba/ba2100f.uml +++ b/ba/ba2100f.uml @@ -117,7 +117,7 @@ BEGIN GROUP 7 END -GROUPBOX F_GROUP 78 3 +GROUPBOX F_GROUP 78 4 BEGIN PROMPT 1 9 "Gruppi di stampa" GROUP 7 @@ -195,9 +195,81 @@ BEGIN GROUP 7 END +BOOLEAN F_GROUP13 +BEGIN + PROMPT 4 11 "13" + GROUP 7 +END + +BOOLEAN F_GROUP14 +BEGIN + PROMPT 10 11 "14" + GROUP 7 +END + +BOOLEAN F_GROUP15 +BEGIN + PROMPT 16 11 "15" + GROUP 7 +END + +BOOLEAN F_GROUP16 +BEGIN + PROMPT 22 11 "16" + GROUP 7 +END + +BOOLEAN F_GROUP17 +BEGIN + PROMPT 28 11 "17" + GROUP 7 +END + +BOOLEAN F_GROUP18 +BEGIN + PROMPT 34 11 "18" + GROUP 7 +END + +BOOLEAN F_GROUP19 +BEGIN + PROMPT 40 11 "19" + GROUP 7 +END + +BOOLEAN F_GROUP20 +BEGIN + PROMPT 46 11 "20" + GROUP 7 +END + +BOOLEAN F_GROUP21 +BEGIN + PROMPT 52 11 "21" + GROUP 7 +END + +BOOLEAN F_GROUP22 +BEGIN + PROMPT 58 11 "22" + GROUP 7 +END + +BOOLEAN F_GROUP23 +BEGIN + PROMPT 64 11 "23" + GROUP 7 +END + +BOOLEAN F_GROUP24 +BEGIN + PROMPT 70 11 "24" + GROUP 7 +END + SPREADSHEET F_ITEMS BEGIN - PROMPT 0 12 "Spreadsheet" + PROMPT 0 13 "Spreadsheet" ITEM "Codice@8" ITEM "Testo@32" ITEM "Messaggio@80" diff --git a/ba/batbinl.uml b/ba/batbinl.uml index 4639f70ba..b282c29da 100755 --- a/ba/batbinl.uml +++ b/ba/batbinl.uml @@ -1,174 +1,177 @@ -#include "batbinl.h" - -TOOLBAR "" 0 20 0 2 - -#include - -ENDPAGE - -PAGE "Tabella Indici Libro Unico" -1 -1 71 20 - -NUMBER F_ANNO 4 -BEGIN - PROMPT 1 1 "Anno esercizio " - FLAGS "AZ" - FIELD CODTAB[1,4] - USE %LBU - INPUT CODTAB[1,4] F_ANNO - INPUT CODTAB[5,7] F_CODLIB - DISPLAY "Anno" CODTAB[1,4] - DISPLAY "Codice libro unico" CODTAB[5,7] - OUTPUT F_ANNO CODTAB[1,4] - OUTPUT F_CODLIB CODTAB[5,7] - CHECKTYPE REQUIRED - KEY 1 -END - -STRING F_CODLIB 3 -BEGIN - PROMPT 28 1 "Libro " - FLAGS "UZ" - FIELD CODTAB[5,7] - COPY ALL F_ANNO - CHECKTYPE REQUIRED - KEY 1 -END - -NUMBER F_INDEX 7 -BEGIN - PROMPT 42 1 "Num. registrazione " - FLAGS "Z" - FIELD CODTAB[8,14] - USE %INL - COPY INPUT F_ANNO - INPUT CODTAB[8,14] F_INDEX - COPY DISPLAY F_ANNO - DISPLAY "Indice@7" CODTAB[8,14] - COPY OUTPUT F_ANNO - OUTPUT F_INDEX CODTAB[8,14] - CHECKTYPE REQUIRED - KEY 1 -END - -NUMBER F_ANNOREG 4 -BEGIN - PROMPT 1 2 "Anno registrazione " - FIELD I0 - CHECKTYPE REQUIRED -END - -LIST F_MESE 2 10 -BEGIN - PROMPT 42 2 "Mese registrazione " - FIELD I1 - FLAGS "M" -END - -NUMBER F_PINI_LU 5 5 -BEGIN - PROMPT 1 3 "Numero pagina iniziale registro unico " - FIELD I2 - FLAGS "UR" - MESSAGE DIRTY,F_PFIN_LU - CHECKTYPE REQUIRED -END - -NUMBER F_PFIN_LU 5 -BEGIN - PROMPT 1 4 "Numero pagina finale registro unico " - FIELD I3 - FLAGS "UR" - NUM_EXPR {#THIS_FIELD>=#F_PINI_LU} - CHECKTYPE REQUIRED - WARNING "Inserire un numero di pagina superiore a quella iniziale" -END - -NUMBER F_DITTA 5 -BEGIN - PROMPT 1 6 "Codice ditta " - FIELD I4 - FLAGS "R" - USE LF_NDITTE - INPUT CODDITTA F_DITTA - DISPLAY "Codice ditta" CODDITTA - DISPLAY "Ragione sociale@50" RAGSOC - OUTPUT F_DITTA CODDITTA - OUTPUT F_RAGSOC RAGSOC - CHECKTYPE REQUIRED - WARNING "E' necessario specificare un codice ditta valido" -END - -STRING F_RAGSOC 50 -BEGIN - PROMPT 1 7 "Ragione sociale " - USE LF_NDITTE KEY 2 - INPUT RAGSOC F_RAGSOC - DISPLAY "Ragione sociale@50" RAGSOC - DISPLAY "Codice ditta" CODDITTA - COPY OUTPUT F_DITTA - CHECKTYPE REQUIRED -END - -STRING F_CODREG 3 -BEGIN - PROMPT 1 8 "Codice registro " - FIELD S0 - USE REG - FLAGS "UZ" - INPUT CODTAB[1,4] F_ANNOREG - INPUT CODTAB[5,7] F_CODREG - DISPLAY "Anno" CODTAB[1,4] - DISPLAY "Codice" CODTAB[5,7] - DISPLAY "Descrizione@50" S0 - OUTPUT F_ANNOREG CODTAB[1,4] - OUTPUT F_CODREG CODTAB[5,7] - OUTPUT F_DESCREG S0 - CHECKTYPE NORMAL -END - -STRING F_DESCREG 50 50 -BEGIN - PROMPT 1 9 "Descrizione " - USE REG KEY 2 SELECT CODTAB[1,4]=#F_ANNO - INPUT S0 F_DESCREG - DISPLAY "Descrizione@50" S0 - DISPLAY "Codice registro" CODTAB[5,7] - COPY OUTPUT F_CODREG - CHECKTYPE NORMAL -END - -NUMBER F_PINI_RU 5 -BEGIN - PROMPT 1 11 "Numero iniziale pagina registro utente " - FIELD I5 - FLAGS "R" -END - -NUMBER F_PFIN_RU 5 -BEGIN - PROMPT 1 12 "Numero finale pagina registro utente " - FIELD I6 - FLAGS "R" -END - -STRING F_CODVID 3 3 -BEGIN - PROMPT 1 14 "Codice vidimazione " - FIELD S1 -END - -BOOLEAN F_STAMPATO -BEGIN - PROMPT 1 16 "Stampato su bollato " - FIELD B0 -END - -BOOLEAN F_PANN_LU -BEGIN - PROMPT 36 16 "Pagine libro unico annullate" - FIELD B1 -END - -ENDPAGE - -ENDMASK +#include "batbinl.h" + +TOOLBAR "" 0 20 0 2 + +#include + +ENDPAGE + +PAGE "Tabella Indici Libro Unico" -1 -1 71 20 + +NUMBER F_ANNO 4 +BEGIN + PROMPT 1 1 "Anno esercizio " + FLAGS "AZ" + FIELD CODTAB[1,4] + USE %LBU + INPUT CODTAB[1,4] F_ANNO + INPUT CODTAB[5,7] F_CODLIB + DISPLAY "Anno" CODTAB[1,4] + DISPLAY "Codice libro unico" CODTAB[5,7] + OUTPUT F_ANNO CODTAB[1,4] + OUTPUT F_CODLIB CODTAB[5,7] + CHECKTYPE REQUIRED + KEY 1 +END + +STRING F_CODLIB 3 +BEGIN + PROMPT 28 1 "Libro " + FLAGS "UZ" + FIELD CODTAB[5,7] + COPY ALL F_ANNO + CHECKTYPE REQUIRED + KEY 1 +END + +NUMBER F_INDEX 7 +BEGIN + PROMPT 42 1 "Num. registrazione " + FLAGS "Z" + FIELD CODTAB[8,14] + USE %INL + COPY INPUT F_ANNO + INPUT CODTAB[8,14] F_INDEX + COPY DISPLAY F_ANNO + DISPLAY "Indice@7" CODTAB[8,14] + COPY OUTPUT F_ANNO + OUTPUT F_INDEX CODTAB[8,14] + CHECKTYPE REQUIRED + KEY 1 +END + +NUMBER F_ANNOREG 4 +BEGIN + PROMPT 1 2 "Anno registrazione " + FIELD I0 + CHECKTYPE REQUIRED +END + +LIST F_MESE 2 10 +BEGIN + PROMPT 42 2 "Mese registrazione " + FIELD I1 + FLAGS "M" +END + +NUMBER F_PINI_LU 5 +BEGIN + PROMPT 1 3 "Numero pagina iniziale registro unico " + FIELD I2 + FLAGS "UR" + MESSAGE DIRTY,F_PFIN_LU + CHECKTYPE REQUIRED +END + +NUMBER F_PFIN_LU 5 +BEGIN + PROMPT 1 4 "Numero pagina finale registro unico " + FIELD I3 + FLAGS "UR" + NUM_EXPR {#THIS_FIELD>=#F_PINI_LU} + CHECKTYPE REQUIRED + WARNING "Inserire un numero di pagina superiore a quella iniziale" +END + +NUMBER F_DITTA 5 +BEGIN + PROMPT 1 6 "Codice ditta " + FIELD I4 + FLAGS "R" + USE LF_NDITTE + INPUT CODDITTA F_DITTA + DISPLAY "Codice ditta" CODDITTA + DISPLAY "Ragione sociale@50" RAGSOC + OUTPUT F_DITTA CODDITTA + OUTPUT F_RAGSOC RAGSOC + CHECKTYPE REUIRED + WARNING "E' necessario specificare un codice ditta valido" +END + +STRING F_RAGSOC 50 +BEGIN + PROMPT 1 7 "Ragione sociale " + USE LF_NDITTE KEY 2 + INPUT RAGSOC F_RAGSOC + DISPLAY "Ragione sociale@50" RAGSOC + DISPLAY "Codice ditta" CODDITTA + COPY OUTPUT F_DITTA + CHECKTYPE NORMAL +END + +STRING F_CODREG 3 +BEGIN + PROMPT 1 8 "Codice registro " + FIELD S0 + USE REG + FLAGS "UZ" + INPUT CODTAB[1,4] F_ANNOREG + INPUT CODTAB[5,7] F_CODREG + DISPLAY "Anno" CODTAB[1,4] + DISPLAY "Codice" CODTAB[5,7] + DISPLAY "Descrizione@50" S0 + OUTPUT F_ANNOREG CODTAB[1,4] + OUTPUT F_CODREG CODTAB[5,7] + OUTPUT F_DESCREG S0 + CHECKTYPE REQUIRED + VALIDATE NOT_EMPTY_CHECK_FIELD +END + +STRING F_DESCREG 50 +BEGIN + PROMPT 1 9 "Descrizione " + USE REG KEY 2 SELECT CODTAB[1,4]=#F_ANNO + INPUT S0 F_DESCREG + DISPLAY "Descrizione@50" S0 + DISPLAY "Codice registro" CODTAB[5,7] + COPY OUTPUT F_CODREG + CHECKTYPE NORMAL +END + +NUMBER F_PINI_RU 5 +BEGIN + PROMPT 1 11 "Numero iniziale pagina registro utente " + FIELD I5 + FLAGS "R" +END + +NUMBER F_PFIN_RU 5 +BEGIN + PROMPT 1 12 "Numero finale pagina registro utente " + FIELD I6 + FLAGS "R" +END + +STRING F_CODVID 3 +BEGIN + PROMPT 1 14 "Codice vidimazione " + FIELD S1 +END + +BOOLEAN F_STAMPATO +BEGIN + PROMPT 1 16 "Stampato su bollato " + FIELD B0 +END + +BOOLEAN F_PANN_LU +BEGIN + PROMPT 36 16 "Pagine libro unico annullate" + FIELD B1 + MESSAGE FALSE REQUIRED,F_DITTA|REQUIRED,F_CODREG + MESSAGE TRUE NORMAL,F_DITTA|NORMAL,F_CODREG +END + +ENDPAGE + +ENDMASK diff --git a/ba/batblbu.uml b/ba/batblbu.uml index 16fc574a1..32c50ae77 100755 --- a/ba/batblbu.uml +++ b/ba/batblbu.uml @@ -49,10 +49,24 @@ BEGIN CHECKTYPE REQUIRED KEY 2 END - + +NUMBER F_CODTABLIB 2 +BEGIN + PROMPT 3 3 "Codice libro " + FIELD I3 + FLAGS "Z" + USE %ITL + INPUT CODTAB F_CODTABLIB + DISPLAY "Codice" CODTAB + DISPLAY "Descrizione@50" S0 + OUTPUT F_CODTABLIB CODTAB + OUTPUT F_DESCRLBU S0 + CHECKTYPE NORMAL +END + LIST F_ULT_MESE_STAMP 2 12 BEGIN - PROMPT 3 3 "Ultimo mese stampa " + PROMPT 3 5 "Ultimo mese stampa " FIELD I0 ITEM " |Nessuno" FLAGS "M" @@ -60,13 +74,13 @@ END NUMBER F_ULT_PAG 5 BEGIN - PROMPT 55 3 "Ultima pagina " + PROMPT 55 5 "Ultima pagina " FIELD I1 END LIST F_TIPOA 10 BEGIN - PROMPT 3 4 "Tipo persona " + PROMPT 3 6 "Tipo persona " FIELD S2 ITEM "F|Fisica" ITEM "G|Giuridica" @@ -74,7 +88,7 @@ END NUMBER F_CODANAGR 5 BEGIN - PROMPT 55 4 "Codice " + PROMPT 55 6 "Codice " FIELD I4 USE LF_ANAG INPUT TIPOA F_TIPOA SELECT @@ -90,7 +104,7 @@ END STRING F_TIPOANAGR 50 BEGIN - PROMPT 3 5 "Tipo anagrafico " + PROMPT 3 7 "Tipo anagrafico " USE LF_ANAG KEY 2 INPUT TIPOA F_TIPOA SELECT INPUT RAGSOC F_TIPOANAGR @@ -101,31 +115,6 @@ BEGIN CHECKTYPE REQUIRED END -NUMBER F_CODTABLIB 2 -BEGIN - PROMPT 3 6 "Codice libro " - FIELD I3 - FLAGS "Z" - USE %ITL - INPUT CODTAB F_CODTABLIB - DISPLAY "Codice" CODTAB - DISPLAY "Descrizione@50" S0 - OUTPUT F_CODTABLIB CODTAB - OUTPUT F_DESCR S0 - CHECKTYPE REQUIRED -END - -STRING F_DESCR 50 -BEGIN - PROMPT 3 7 "Descrizione " - USE %ITL KEY 2 - INPUT S0 F_DESCR - DISPLAY "Descrizione@50" S0 - DISPLAY "Codice" CODTAB - COPY OUTPUT F_CODTABLIB - CHECKTYPE REQUIRED -END - STRING F_CONSPRESSO 40 BEGIN PROMPT 3 8 "Conservato presso " @@ -164,7 +153,7 @@ END BOOLEAN F_STAMPAINDCOMP BEGIN - PROMPT 3 14 "Stampa l' indirizzo completo della ditta" + PROMPT 3 14 "Stampa l'indirizzo completo della ditta" FIELD B1 END diff --git a/ba/batbreg.uml b/ba/batbreg.uml index 5794c4ae5..d4f8c334a 100755 --- a/ba/batbreg.uml +++ b/ba/batbreg.uml @@ -225,6 +225,7 @@ BEGIN OUTPUT F_ANNO CODTAB[1,4] OUTPUT F_CODLBU CODTAB[5,7] WARNING "Libro unico assente" + CHECKTYPE NORMAL END ENDPAGE