diff --git a/ba/ba0100a.h b/ba/ba0100a.h index 42fbd495f..e3d186fd2 100755 --- a/ba/ba0100a.h +++ b/ba/ba0100a.h @@ -11,20 +11,25 @@ #define F_CG 207 #define F_ST 208 #define F_MI 209 -#define F_GR 210 +#define F_AI 210 #define F_CE 211 #define F_AD 212 #define F_SC 213 #define F_MU 214 -#define F_CA 215 +#define F_CM 215 #define F_73 216 +#define F_AT 217 #define F_IN 218 +#define F_PO 219 #define F_AB 220 #define F_NI 221 #define F_NR 222 #define F_PC 223 +#define F_AF 224 #define F_IC 225 #define F_IS 226 +#define F_TC 227 +#define F_TM 228 #define F_VE 231 #define F_MG 232 #define F_OR 233 diff --git a/ba/ba1400a.uml b/ba/ba1400a.uml index 4977ea46f..df724b3f7 100755 --- a/ba/ba1400a.uml +++ b/ba/ba1400a.uml @@ -98,9 +98,9 @@ BEGIN FIELD AUTSTR[10,10] END -BOOLEAN DLG_NULL +BOOLEAN F_AI BEGIN - PROMPT 31 8 "" + PROMPT 31 8 "Archiviazione immagini" FIELD AUTSTR[11,11] FLAGS "D" END @@ -129,9 +129,9 @@ BEGIN FIELD AUTSTR[15,15] END -BOOLEAN DLG_NULL +BOOLEAN F_CM BEGIN - PROMPT 1 10 "" + PROMPT 1 10 "Gestione Commesse" FIELD AUTSTR[16,16] END @@ -141,9 +141,9 @@ BEGIN FIELD AUTSTR[17,17] END -BOOLEAN DLG_NULL +BOOLEAN F_AT BEGIN - PROMPT 59 10 "" + PROMPT 59 10 "AVIS Assist" FIELD AUTSTR[18,18] END @@ -153,9 +153,9 @@ BEGIN FIELD AUTSTR[19,19] END -BOOLEAN DLG_NULL +BOOLEAN F_PO BEGIN - PROMPT 31 11 "" + PROMPT 31 11 "Modulo Penna Ottica" FIELD AUTSTR[20,20] FLAGS "D" END @@ -184,9 +184,9 @@ BEGIN FIELD AUTSTR[24,24] END -BOOLEAN DLG_NULL +BOOLEAN F_AF BEGIN - PROMPT 1 13 "" + PROMPT 1 13 "Autoformazione" FIELD AUTSTR[25,25] FLAGS "D" END @@ -203,16 +203,16 @@ BEGIN FIELD AUTSTR[27,27] END -BOOLEAN DLG_NULL +BOOLEAN F_TC BEGIN - PROMPT 1 14 "" + PROMPT 1 14 "Tecnico Contabile" FIELD AUTSTR[28,28] FLAGS "D" END -BOOLEAN DLG_NULL +BOOLEAN F_TM BEGIN - PROMPT 31 14 "" + PROMPT 31 14 "Tecnico App.Merci" FIELD AUTSTR[29,29] FLAGS "D" END diff --git a/ba/ba1500.cpp b/ba/ba1500.cpp index c43874573..31fcf86b9 100755 --- a/ba/ba1500.cpp +++ b/ba/ba1500.cpp @@ -338,8 +338,20 @@ bool TAttivazione_moduli::create() } } break; - case _aga_key: case _prassi_key: + _msk->disable(F_CM); + _msk->disable(F_AT); + _msk->disable(F_PO); + _msk->disable(F_AF); + _msk->disable(F_TC); + _msk->disable(F_TM); + _msk->disable(F_VE); + _msk->disable(F_MG); + _msk->disable(F_OR); + _msk->disable(F_EF); + _msk->disable(F_DB); + _msk->disable(F_SP); + case _aga_key: { _msk->set_handler(F_K2, decode_hnd); _msk->disable(F_K3); diff --git a/ba/ba1500a.uml b/ba/ba1500a.uml index 9d0bd9613..902cf06b3 100755 --- a/ba/ba1500a.uml +++ b/ba/ba1500a.uml @@ -106,10 +106,9 @@ BEGIN PROMPT 1 8 "Modello IVA 11" END -BOOLEAN DLG_NULL +BOOLEAN F_AI BEGIN - PROMPT 31 8 "" - FLAGS "D" + PROMPT 31 8 "Archviazione Immagini" END BOOLEAN F_CE @@ -132,10 +131,9 @@ BEGIN PROMPT 59 9 "Multiutenza" END -BOOLEAN DLG_NULL +BOOLEAN F_CM BEGIN - PROMPT 1 10 "" - FLAGS "D" + PROMPT 1 10 "Commesse" END BOOLEAN F_73 @@ -143,10 +141,9 @@ BEGIN PROMPT 31 10 "Modello 730" END -BOOLEAN DLG_NULL +BOOLEAN F_AT BEGIN - PROMPT 59 10 "" - FLAGS "D" + PROMPT 59 10 "AVIS Assist" END BOOLEAN F_IN @@ -154,10 +151,9 @@ BEGIN PROMPT 1 11 "Elenchi Intrac." END -BOOLEAN DLG_NULL +BOOLEAN F_PO BEGIN - PROMPT 31 11 "" - FLAGS "D" + PROMPT 31 11 "Penna Ottica" END BOOLEAN F_AB @@ -180,10 +176,9 @@ BEGIN PROMPT 59 12 "Parcellazione" END -BOOLEAN DLG_NULL +BOOLEAN F_AF BEGIN - PROMPT 1 13 "" - FLAGS "D" + PROMPT 1 13 "Autoformazione" END BOOLEAN F_IC @@ -196,16 +191,14 @@ BEGIN PROMPT 59 13 "Gestione ISI" END -BOOLEAN DLG_NULL +BOOLEAN F_TC BEGIN - PROMPT 1 14 "" - FLAGS "D" + PROMPT 1 14 "Tecnico Contabile" END -BOOLEAN DLG_NULL +BOOLEAN F_TM BEGIN - PROMPT 31 14 "" - FLAGS "D" + PROMPT 31 14 "Tecnico App.Merci" END BOOLEAN DLG_NULL