From 971509e7c7b73c611720f43513e524c6612567f4 Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 16 Nov 1994 12:03:13 +0000 Subject: [PATCH] Corretti tracciati e modificata lista dei moduli git-svn-id: svn://10.65.10.50/trunk@633 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ba/ba0.cpp | 6 +- ba/ba0100a.h | 35 +++++-- ba/ba1400.cpp | 4 +- ba/ba1400a.uml | 270 ++++++++++++++++++++++++++++++++++++++++--------- ba/ba1500a.uml | 217 +++++++++++++++++++++++++++++++++------ ba/dir.gen.asc | 4 +- ba/makefile | 4 +- ba/prassi.mnu | 36 ++++--- ba/trc.gen.asc | 38 +++---- 9 files changed, 488 insertions(+), 126 deletions(-) diff --git a/ba/ba0.cpp b/ba/ba0.cpp index 6711c05cc..6eebad8ea 100755 --- a/ba/ba0.cpp +++ b/ba/ba0.cpp @@ -521,7 +521,7 @@ bool TMenu_application::create() TScanner scanner("prassi.aut"); for (int aut = 0; scanner.line() != ""; aut++) - _modules.add(new TString(scanner.token())); + _modules.add(scanner.token()); } load_menu(); dispatch_e_menu(BAR_ITEM(1)); @@ -558,10 +558,10 @@ bool TMenu_application::menu(MENU_TAG) { refarray[i++] = _level; if (l < _max) _level = l; - } + } } else - { + { TExternal_app a(option); const TString& module = option.left(2); if (module == "ba") _ditta_asked = FALSE; else diff --git a/ba/ba0100a.h b/ba/ba0100a.h index 57f02d55f..a6bdf797e 100755 --- a/ba/ba0100a.h +++ b/ba/ba0100a.h @@ -2,13 +2,32 @@ #define F_PASSWORD 102 #define F_USERDESC 103 #define F_BASE 200 -#define F_CG 201 -#define F_MU 202 -#define F_SC 203 -#define F_EF 204 -#define F_VE 205 -#define F_MG 206 -#define F_770 207 -#define F_AB 220 +#define F_74 201 +#define F_75 202 +#define F_76 203 +#define F_77 204 +#define F_GI 205 +#define F_SE 206 +#define F_CG 207 +#define F_ST 208 +#define F_MI 209 +#define F_GR 210 +#define F_CE 211 +#define F_AB 212 +#define F_SC 213 +#define F_MU 214 +#define F_CA 215 +#define F_73 216 +#define F_IN 218 +#define F_AD 220 #define F_NI 221 #define F_NR 222 +#define F_PC 223 +#define F_IC 225 +#define F_IS 226 +#define F_VE 231 +#define F_MG 232 +#define F_OR 233 +#define F_EF 234 +#define F_DB 235 +#define F_SP 236 diff --git a/ba/ba1400.cpp b/ba/ba1400.cpp index 9c6f8fb9a..cd70e4003 100755 --- a/ba/ba1400.cpp +++ b/ba/ba1400.cpp @@ -51,7 +51,9 @@ void TSet_users::enable_aut(TMask& m) { TMask_field& f = m.fld(pos); - f.enable(!prassi && has_module(i, CHK_DONGLE)); + f.enable_default(); + if (f.enabled()) + f.enable(!prassi && has_module(i, CHK_DONGLE)); if (prassi) f.set("X"); } } diff --git a/ba/ba1400a.uml b/ba/ba1400a.uml index b43e2d285..abf3024f2 100755 --- a/ba/ba1400a.uml +++ b/ba/ba1400a.uml @@ -17,99 +17,279 @@ BEGIN DISPLAY "Utente" USERNAME DISPLAY "Descrizione@50" USERDESC OUTPUT F_USER USERNAME - KEY 1 - CHECHTYPE REQUIRED - FIELD USERNAME + KEY 1 + CHECHTYPE REQUIRED + FIELD USERNAME END STRING F_USERDESC 50 BEGIN - PROMPT 1 3 "Descrizione " - FIELD USERDESC - MESSAGE "X",F_BASE + PROMPT 1 2 "Descrizione " + FIELD USERDESC + MESSAGE "X",F_BASE END STRING F_PASSWORD 8 0 BEGIN - PROMPT 1 5 "Password " + PROMPT 1 3 "Password " HELP "Inserire la password" - MESSAGE "X",F_BASE - MESSAGE "X",F_MU + MESSAGE "X",F_BASE + MESSAGE "X",F_MU END -GROUPBOX DLG_NULL 76 13 +GROUPBOX DLG_NULL 78 15 BEGIN - PROMPT 0 7 "Moduli" + PROMPT 0 4 "Moduli" END BOOLEAN F_BASE BEGIN - PROMPT 1 8 "Base" - FLAGS "D" - FIELD AUTSTR[1,1] + PROMPT 1 5 "Base" + FLAGS "D" + FIELD AUTSTR[1,1] +END + +BOOLEAN F_74 +BEGIN + PROMPT 31 5 "Modello 740" + FIELD AUTSTR[2,2] +END + +BOOLEAN F_75 +BEGIN + PROMPT 59 5 "Modello 750" + FIELD AUTSTR[3,3] + FLAGS "D" +END + +BOOLEAN F_76 +BEGIN + PROMPT 1 6 "Modello 760" + FIELD AUTSTR[4,4] + FLAGS "D" +END + +BOOLEAN F_77 +BEGIN + PROMPT 31 6 "Modello 770" + FIELD AUTSTR[5,5] +END + +BOOLEAN F_GI +BEGIN + PROMPT 59 6 "Gestione IVA" + FIELD AUTSTR[6,6] +END + +BOOLEAN F_SE +BEGIN + PROMPT 1 7 "Cont.Semplificata" + FIELD AUTSTR[7,7] + FLAGS "D" END BOOLEAN F_CG BEGIN - PROMPT 31 8 "Contabilita'" - FIELD AUTSTR[2,2] + PROMPT 31 7 "Contabilita'" + FIELD AUTSTR[8,8] END -BOOLEAN F_MU +BOOLEAN F_ST BEGIN - PROMPT 59 8 "Multiutenza" - FIELD AUTSTR[3,3] + PROMPT 59 7 "Gestione Studi" + FIELD AUTSTR[9,9] FLAGS "D" END -BOOLEAN F_SC +BOOLEAN F_MI BEGIN - PROMPT 1 9 "Saldaconto" - FIELD AUTSTR[4,4] + PROMPT 1 8 "Modello IVA 11" + FIELD AUTSTR[10,10] + FLAGS "D" END -BOOLEAN F_EF +BOOLEAN DLG_NULL BEGIN - PROMPT 31 9 "Portafoglio" - FIELD AUTSTR[5,5] + PROMPT 31 8 "" + FIELD AUTSTR[11,11] + FLAGS "D" END -BOOLEAN F_VE +BOOLEAN F_CE BEGIN - PROMPT 59 9 "Vendite" - FIELD AUTSTR[6,6] -END - -BOOLEAN F_MG -BEGIN - PROMPT 1 10 "Magazzino" - FIELD AUTSTR[7,7] -END - -BOOLEAN F_770 -BEGIN - PROMPT 31 10 "770" - FIELD AUTSTR[8,8] + PROMPT 59 8 "Cespiti" + FIELD AUTSTR[12,12] + FLAGS "D" END BOOLEAN F_AB BEGIN - PROMPT 59 10 "Bilanci" - FIELD AUTSTR[21,21] + PROMPT 1 9 "Analisi di Bilancio" + FIELD AUTSTR[13,13] END -BOOLEAN F_NI +BOOLEAN F_SC BEGIN - PROMPT 1 11 "Nota integrativa" + PROMPT 31 9 "Saldaconto" + FIELD AUTSTR[14,14] +END + +BOOLEAN F_MU +BEGIN + PROMPT 59 9 "Multiutenza" + FIELD AUTSTR[15,15] +END + +BOOLEAN DLG_NULL +BEGIN + PROMPT 1 10 "" + FIELD AUTSTR[16,16] + FLAGS "D" +END + +BOOLEAN F_73 +BEGIN + PROMPT 31 10 "Modello 730" + FIELD AUTSTR[17,17] + FLAGS "D" +END + +BOOLEAN DLG_NULL +BEGIN + PROMPT 59 10 "" + FIELD AUTSTR[18,18] + FLAGS "D" +END + +BOOLEAN F_IN +BEGIN + PROMPT 1 11 "Elenchi Intrac." + FIELD AUTSTR[19,19] + FLAGS "D" +END + +BOOLEAN DLG_NULL +BEGIN + PROMPT 31 11 "" + FIELD AUTSTR[20,20] + FLAGS "D" +END + +BOOLEAN F_AD +BEGIN + PROMPT 59 11 "Anagr.Dichiar." + FIELD AUTSTR[21,21] + FLAGS "D" +END + +BOOLEAN F_NI +BEGIN + PROMPT 1 12 "Nota Integrativa" FIELD AUTSTR[22,22] END BOOLEAN F_NR BEGIN - PROMPT 31 11 "Nota integrativa ridotta" + PROMPT 31 12 "Nota Integrativa Rid." FIELD AUTSTR[23,23] END +BOOLEAN F_PC +BEGIN + PROMPT 59 12 "Parcellazione" + FIELD AUTSTR[24,24] +END + +BOOLEAN DLG_NULL +BEGIN + PROMPT 1 13 "" + FIELD AUTSTR[25,25] + FLAGS "D" +END + +BOOLEAN F_IC +BEGIN + PROMPT 31 13 "Gestione ICI" + FIELD AUTSTR[26,26] +END + +BOOLEAN F_IS +BEGIN + PROMPT 59 13 "Gestione ISI" + FIELD AUTSTR[27,27] + FLAGS "D" +END + +BOOLEAN DLG_NULL +BEGIN + PROMPT 1 14 "" + FIELD AUTSTR[28,28] + FLAGS "D" +END + +BOOLEAN DLG_NULL +BEGIN + PROMPT 31 14 "" + FIELD AUTSTR[29,29] + FLAGS "D" +END + +BOOLEAN DLG_NULL +BEGIN + PROMPT 59 14 "" + FIELD AUTSTR[30,30] + FLAGS "D" +END + +BOOLEAN DLG_NULL +BEGIN + PROMPT 1 15 "" + FIELD AUTSTR[31,31] + FLAGS "D" +END + +BOOLEAN F_VE +BEGIN + PROMPT 31 15 "Vendite" + FIELD AUTSTR[32,32] + FLAGS "D" +END + +BOOLEAN F_MG +BEGIN + PROMPT 59 15 "Magazzino" + FIELD AUTSTR[33,33] + FLAGS "D" +END + +BOOLEAN F_OR +BEGIN + PROMPT 1 16 "Ordini" + FIELD AUTSTR[34,34] + FLAGS "D" +END + +BOOLEAN F_EF +BEGIN + PROMPT 31 16 "Gestione effetti" + FIELD AUTSTR[35,35] + FLAGS "D" +END + +BOOLEAN F_DB +BEGIN + PROMPT 59 16 "Distinta Base" + FIELD AUTSTR[36,36] + FLAGS "D" +END + +BOOLEAN F_SP +BEGIN + PROMPT 1 17 "Statistiche e Provvigioni" + FIELD AUTSTR[38,38] + FLAGS "D" +END + ENDPAGE ENDMASK diff --git a/ba/ba1500a.uml b/ba/ba1500a.uml index 0bbf1c943..45309195b 100755 --- a/ba/ba1500a.uml +++ b/ba/ba1500a.uml @@ -1,7 +1,7 @@ #include "ba0100a.h" #include "ba1500a.h" -PAGE "Selezione utente" -1 -1 77 22 +PAGE "Selezione utente" -1 -1 79 22 STRING F_K1 16 BEGIN @@ -24,82 +24,237 @@ END STRING F_K3 16 BEGIN - PROMPT 1 3 "Attivazione 2 " + PROMPT 1 2 "Attivazione 2 " FLAGS "U" MESSAGE "X",F_BASE END STRING F_K4 16 BEGIN - PROMPT 35 3 "" + PROMPT 35 2 "" FLAGS "U" END DATE F_DT BEGIN - PROMPT 56 3 "Data " + PROMPT 56 2 "Data " FLAGS "D" END -GROUPBOX DLG_NULL 76 13 +GROUPBOX DLG_NULL 78 15 BEGIN - PROMPT 0 5 "Moduli" + PROMPT 0 4 "Moduli" END BOOLEAN F_BASE BEGIN - PROMPT 1 6 "Base" - FLAGS "D" + PROMPT 1 5 "Base" + FLAGS "D" +END + +BOOLEAN F_74 +BEGIN + PROMPT 31 5 "Modello 740" +END + +BOOLEAN F_75 +BEGIN + PROMPT 59 5 "Modello 750" + FLAGS "D" +END + +BOOLEAN F_76 +BEGIN + PROMPT 1 6 "Modello 760" + FLAGS "D" +END + +BOOLEAN F_77 +BEGIN + PROMPT 31 6 "Modello 770" +END + +BOOLEAN F_GI +BEGIN + PROMPT 59 6 "Gestione IVA" +END + +BOOLEAN F_SE +BEGIN + PROMPT 1 7 "Cont.Semplificata" + FLAGS "D" END BOOLEAN F_CG BEGIN - PROMPT 31 6 "Contabilita'" + PROMPT 31 7 "Contabilita'" END -BOOLEAN F_MU +BOOLEAN F_ST BEGIN - PROMPT 59 6 "Multiutenza" + PROMPT 59 7 "Gestione Studi" + FLAGS "D" END -BOOLEAN F_SC +BOOLEAN F_MI BEGIN - PROMPT 1 7 "Saldaconto" + PROMPT 1 8 "Modello IVA 11" + FLAGS "D" END -BOOLEAN F_EF +BOOLEAN DLG_NULL BEGIN - PROMPT 31 7 "Portafoglio" + PROMPT 31 8 "" + FLAGS "D" END -BOOLEAN F_VE +BOOLEAN F_CE BEGIN - PROMPT 59 7 "Vendite" -END - -BOOLEAN F_MG -BEGIN - PROMPT 1 8 "Magazzino" -END - -BOOLEAN F_770 -BEGIN - PROMPT 31 8 "770" + PROMPT 59 8 "Cespiti" + FLAGS "D" END BOOLEAN F_AB BEGIN - PROMPT 59 8 "Bilanci" + PROMPT 1 9 "Analisi di Bilancio" END -BOOLEAN F_NI +BOOLEAN F_SC BEGIN - PROMPT 1 9 "Nota integrativa" + PROMPT 31 9 "Saldaconto" +END + +BOOLEAN F_MU +BEGIN + PROMPT 59 9 "Multiutenza" +END + +BOOLEAN DLG_NULL +BEGIN + PROMPT 1 10 "" + FLAGS "D" +END + +BOOLEAN F_73 +BEGIN + PROMPT 31 10 "Modello 730" + FLAGS "D" +END + +BOOLEAN DLG_NULL +BEGIN + PROMPT 59 10 "" + FLAGS "D" +END + +BOOLEAN F_IN +BEGIN + PROMPT 1 11 "Elenchi Intrac." + FLAGS "D" +END + +BOOLEAN DLG_NULL +BEGIN + PROMPT 31 11 "" + FLAGS "D" +END + +BOOLEAN F_AD +BEGIN + PROMPT 59 11 "Anagr.Dichiar." + FLAGS "D" +END + +BOOLEAN F_NI +BEGIN + PROMPT 1 12 "Nota Integrativa" END BOOLEAN F_NR BEGIN - PROMPT 31 9 "Nota integrativa ridotta" + PROMPT 31 12 "Nota Integrativa Rid." +END + +BOOLEAN F_PC +BEGIN + PROMPT 59 12 "Parcellazione" +END + +BOOLEAN DLG_NULL +BEGIN + PROMPT 1 13 "" + FLAGS "D" +END + +BOOLEAN F_IC +BEGIN + PROMPT 31 13 "Gestione ICI" +END + +BOOLEAN F_IS +BEGIN + PROMPT 59 13 "Gestione ISI" + FLAGS "D" +END + +BOOLEAN DLG_NULL +BEGIN + PROMPT 1 14 "" + FLAGS "D" +END + +BOOLEAN DLG_NULL +BEGIN + PROMPT 31 14 "" + FLAGS "D" +END + +BOOLEAN DLG_NULL +BEGIN + PROMPT 59 14 "" + FLAGS "D" +END + +BOOLEAN DLG_NULL +BEGIN + PROMPT 1 15 "" + FLAGS "D" +END + +BOOLEAN F_VE +BEGIN + PROMPT 31 15 "Vendite" + FLAGS "D" +END + +BOOLEAN F_MG +BEGIN + PROMPT 59 15 "Magazzino" + FLAGS "D" +END + +BOOLEAN F_OR +BEGIN + PROMPT 1 16 "Ordini" + FLAGS "D" +END + +BOOLEAN F_EF +BEGIN + PROMPT 31 16 "Gestione effetti" + FLAGS "D" +END + +BOOLEAN F_DB +BEGIN + PROMPT 59 16 "Distinta Base" + FLAGS "D" +END + +BOOLEAN F_SP +BEGIN + PROMPT 1 17 "Statistiche e Provvigioni" + FLAGS "D" END BUTTON DLG_OK 9 2 diff --git a/ba/dir.gen.asc b/ba/dir.gen.asc index 1a4c8d02c..1cc96ddb7 100755 --- a/ba/dir.gen.asc +++ b/ba/dir.gen.asc @@ -79,10 +79,10 @@ M #@ !0