From a1486179c95167c14f5024fcba97ca82adb4b8c9 Mon Sep 17 00:00:00 2001 From: guy Date: Mon, 16 Jan 1995 15:02:49 +0000 Subject: [PATCH] Corrette maschere git-svn-id: svn://10.65.10.50/trunk@867 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ba/ba0.cpp | 2 +- ba/ba0.url | 8 +++--- ba/ba2.url | 6 ----- ba/ba4500a.uml | 6 ++--- ba/batbcpg.rpt | 2 +- ba/batbdel.uml | 70 ++++++++++++++++++++++++++------------------------ ba/batbinl.uml | 8 +++--- ba/batblbu.uml | 5 ++-- ba/batbval.uml | 2 +- ba/prassi.mnu | 11 ++++---- 10 files changed, 59 insertions(+), 61 deletions(-) diff --git a/ba/ba0.cpp b/ba/ba0.cpp index 28c889d2b..cf09baf43 100755 --- a/ba/ba0.cpp +++ b/ba/ba0.cpp @@ -55,7 +55,7 @@ void TPicture_mask::set_picture(short id) _id = id; #if XVT_OS == XVT_OS_WIN if (_picture) picture_free(_picture); - _picture = xvt_picture_load(id, TRUE); + _picture = xvt_picture_load(id, id == BA0_PICTURE); #endif } } diff --git a/ba/ba0.url b/ba/ba0.url index 9e85a891f..5f9a6cdaa 100755 --- a/ba/ba0.url +++ b/ba/ba0.url @@ -5,10 +5,10 @@ MENU TASK_MENUBAR #if XVT_OS == XVT_OS_WIN #transparent $$$ - 883 bitmap DISCARDABLE f:\p.due\bmp\ba00.bmp - 884 bitmap DISCARDABLE f:\p.due\bmp\ba01.bmp - 885 bitmap DISCARDABLE f:\p.due\bmp\ba02.bmp - 886 bitmap DISCARDABLE f:\p.due\bmp\ba03.bmp + 883 bitmap DISCARDABLE f:\p.due\bmp\menubmp\ba00.bmp + 884 bitmap DISCARDABLE f:\p.due\bmp\menubmp\ba01.bmp + 885 bitmap DISCARDABLE f:\p.due\bmp\menubmp\ba02.bmp + 886 bitmap DISCARDABLE f:\p.due\bmp\menubmp\ba03.bmp $$$ #endif diff --git a/ba/ba2.url b/ba/ba2.url index f9373e86c..105500245 100755 --- a/ba/ba2.url +++ b/ba/ba2.url @@ -47,26 +47,20 @@ MENU BAR_ITEM(4) MENUBAR TASK_MENUBAR + 1 MENU TASK_MENUBAR + 1 - SUBMENU MENU_FILE_ALT "~File" - SUBMENU MENU_EDIT "~Stampanti" MENUBAR TASK_MENUBAR + 2 MENU TASK_MENUBAR + 2 - SUBMENU MENU_FILE_ALT "~File" - SUBMENU MENU_EDIT "~Stampanti" MENUBAR TASK_MENUBAR + 3 MENU TASK_MENUBAR + 3 SUBMENU MENU_FILE_ALT "~File" - SUBMENU MENU_EDIT "~Stampanti" MENUBAR TASK_MENUBAR + 4 MENU TASK_MENUBAR + 4 SUBMENU MENU_FILE_ALT "~File" - SUBMENU MENU_EDIT "~Stampanti" diff --git a/ba/ba4500a.uml b/ba/ba4500a.uml index 9f335e416..50955b000 100755 --- a/ba/ba4500a.uml +++ b/ba/ba4500a.uml @@ -211,7 +211,7 @@ END BOOLEAN CHK_AT1_MEDCONV BEGIN - PROMPT 1 11 "Medici convenzionati ??" + PROMPT 1 11 "Medici convenzionati" FIELD LF_ATTIV->MEDCONV HELP "Indicare se esistono medici convenzionati nell'attivita'" END @@ -232,7 +232,7 @@ END BOOLEAN CHK_AT1_ATTSCORTER BEGIN - PROMPT 44 12 "Senza Corr.Terr.??" + PROMPT 44 12 "Senza Corr.Terr." FIELD LF_ATTIV->ATTSCORTER HELP "Indicare se si tratta di attivita' senza correttivo territoriale" END @@ -260,7 +260,7 @@ END BOOLEAN CHK_AT1_ESLUOGHID BEGIN - PROMPT 44 14 "PiŁ luoghi" + PROMPT 44 14 "Piu' luoghi" FIELD LF_ATTIV->ESLUOGHID HELP "Indicare se l'attivita' si svolge su piu' luoghi" END diff --git a/ba/batbcpg.rpt b/ba/batbcpg.rpt index 8be3c25ad..c18f60668 100755 --- a/ba/batbcpg.rpt +++ b/ba/batbcpg.rpt @@ -9,7 +9,7 @@ Tabella dei codici di pagamento 1|@113g%s|Rate Differenziate [Rows] -1|CODTAB|@2g@16n +1|CODTAB|@2g@16,ls 1|S0|@20g@50,ls 1|I0|@72g@4n 1|CODTAB[11,12]|@78g@15,ls diff --git a/ba/batbdel.uml b/ba/batbdel.uml index 46e5febaa..35f81d595 100755 --- a/ba/batbdel.uml +++ b/ba/batbdel.uml @@ -39,9 +39,44 @@ BEGIN WARNING "Ditta assente" END +LIST F_TIPO 20 +BEGIN + PROMPT 4 3 "Tipo " + FIELD CODTAB[12,12] + KEY 1 + HELP "Tipo di versamento" + ITEM "1|normale" + MESSAGE ENABLE,F_MESE + ITEM "2|annuale" + MESSAGE "13",F_MESE|DISABLE,F_MESE + ITEM "3|art. 74" + MESSAGE ENABLE,F_MESE + ITEM "4|cessazione attivita'" + MESSAGE ENABLE,F_MESE + ITEM "5|integrativa" + MESSAGE ENABLE,F_MESE + ITEM "7|acconti IVA" + MESSAGE "12",F_MESE|DISABLE,F_MESE +END + + +LIST F_MESE 10 +BEGIN + PROMPT 4 4 "Mese " + FIELD CODTAB[10,11] + FLAGS "MA" + KEY 1 + COPY ALL F_ANNO + HELP "Mese di versamento" + ITEM "13|Annuale" + MESSAGE "2",F_TIPO + VALIDATE MTCHECK_FUNC +END + + NUMBER F_ANNO 4 BEGIN - PROMPT 4 3 "Anno " + PROMPT 4 5 "Anno " FIELD CODTAB[6,9] CHECKTYPE REQUIRED FLAGS "RA" @@ -62,40 +97,9 @@ BEGIN OUTPUT F_MESE CODTAB[10,11] OUTPUT F_TIPO CODTAB[12,12] HELP "Anno di versamento" + VALIDATE AUTOEXIT_FUNC 2 F_CODDITTA F_ANNO END -LIST F_MESE 10 -BEGIN - PROMPT 4 4 "Mese " - FIELD CODTAB[10,11] - FLAGS "MA" - KEY 1 - COPY ALL F_ANNO - HELP "Mese di versamento" - ITEM "13|Annuale" - MESSAGE "2",F_TIPO - VALIDATE MTCHECK_FUNC -END - -LIST F_TIPO 20 -BEGIN - PROMPT 4 5 "Tipo " - FIELD CODTAB[12,12] - KEY 1 - HELP "Tipo di versamento" - ITEM "1|normale" - MESSAGE ENABLE,F_MESE - ITEM "2|annuale" - MESSAGE "13",F_MESE|DISABLE,F_MESE - ITEM "3|art. 74" - MESSAGE ENABLE,F_MESE - ITEM "4|cessazione attivita'" - MESSAGE ENABLE,F_MESE - ITEM "5|integrativa" - MESSAGE ENABLE,F_MESE - ITEM "7|acconti IVA" - MESSAGE "12",F_MESE|DISABLE,F_MESE -END DATE F_DATA BEGIN diff --git a/ba/batbinl.uml b/ba/batbinl.uml index 3c31bf14a..31d1f1705 100755 --- a/ba/batbinl.uml +++ b/ba/batbinl.uml @@ -27,11 +27,10 @@ END STRING F_CODLIB 3 BEGIN PROMPT 31 1 "Codice libro " - FLAGS "U" + FLAGS "UZ" FIELD CODTAB[5,7] COPY ALL F_ANNO CHECKTYPE REQUIRED - VALIDATE ZEROFILL_FUNC 3 KEY 1 END @@ -109,13 +108,14 @@ STRING F_CODREG 3 BEGIN PROMPT 1 8 "Codice registro " FIELD S0 - USE REG SELECT CODTAB[1,4]=#F_ANNO + USE REG FLAGS "UZ" - INPUT CODTAB[1,4] F_ANNO + 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 diff --git a/ba/batblbu.uml b/ba/batblbu.uml index c333c1edf..9cc654913 100755 --- a/ba/batblbu.uml +++ b/ba/batblbu.uml @@ -29,11 +29,10 @@ END STRING F_CODLIB 3 BEGIN PROMPT 45 1 "Codice " - FLAGS "U" + FLAGS "UZ" FIELD CODTAB[5,7] COPY ALL F_ANNO CHECKTYPE REQUIRED - VALIDATE ZEROFILL_FUNC 3 KEY 1 END @@ -51,7 +50,7 @@ BEGIN KEY 2 END -LIST F_ULT_MESE_STAMP 2 10 +LIST F_ULT_MESE_STAMP 2 12 BEGIN PROMPT 3 3 "Ultimo mese stampa " FIELD I0 diff --git a/ba/batbval.uml b/ba/batbval.uml index 5175cd93f..48a61e91c 100755 --- a/ba/batbval.uml +++ b/ba/batbval.uml @@ -12,7 +12,7 @@ STRING FLD_TABVAL_CODTAB 3 BEGIN PROMPT 3 1 "Codice " FIELD LF_TABCOM->CODTAB - FLAGS "U" + FLAGS "UZ" KEY 1 USE %VAL INPUT CODTAB FLD_TABVAL_CODTAB diff --git a/ba/prassi.mnu b/ba/prassi.mnu index 6cd719fc9..b5351db1e 100755 --- a/ba/prassi.mnu +++ b/ba/prassi.mnu @@ -88,12 +88,12 @@ 9|Prima nota|2|7 9|Prima nota|cg2 -0 9|Elimina movimenti provvisori|cg2 -1 -9|Ricalcolo saldi|cg4 -0 9|IVA|10|5 9|Lista movimenti|cg3 -0 -9|Mastrini|cg3 -1 -9|Riepiloghi|cg3 -4 +9|Stampa Mastrini|cg3 -1 +9|Stampa Riepiloghi|cg3 -4 9|Visualizzazione saldi|cg5 -2 +9|Ricalcolo saldi|cg4 -0 9|Bilancio|cg1 -4 9|Bilancio IV direttiva CEE|cg1 -5 9|Giornale|cg3 -3 @@ -126,8 +126,9 @@ 13|Stampa tabelle ditta|8|7 13|Prima nota|9|7 13|Servizio|16|7 -14|Gestione libro unico|7 -14|Tabella libro unico|ba3 -4 +14|Gestione libro unico|2|7 +14|Tabella libro unico|ba3 -0 %lbu +14|Tabella indici libro unico|ba3 -0 %inl 14|Tabella vidimazioni|ba3 -0 %vid 14|Stampa indici libro unico|ba3 -5 15|Manutenzione|1