From 48a929407b045d6a034cbf64e0b44c6ab989ce85 Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 8 Aug 1996 15:43:08 +0000 Subject: [PATCH] Correzzione errori git-svn-id: svn://10.65.10.50/trunk@3343 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ba/ba2100b.uml | 10 ++++++++-- ba/ba3700.cpp | 2 +- ba/bastesc.uml | 4 +++- cg/cg1500a.uml | 30 +++++++++++++++--------------- cg/cg4100b.uml | 1 + cg/cg4600a.uml | 2 ++ cg/cg5200a.uml | 1 + cg/cg5400a.uml | 1 + 8 files changed, 32 insertions(+), 19 deletions(-) diff --git a/ba/ba2100b.uml b/ba/ba2100b.uml index 8eb54710a..2c3ae416f 100755 --- a/ba/ba2100b.uml +++ b/ba/ba2100b.uml @@ -24,7 +24,7 @@ BEGIN FIELD CODPROF HELP "Codice del profilo utente" USE LF_FORM - INPUT TIPOPROF F_BASE + INPUT TIPOPROF F_BASE SELECT INPUT CODPROF F_CODE DISPLAY "Profilo base" TIPOPROF DISPLAY "Codice" CODPROF @@ -38,7 +38,13 @@ STRING F_DESC 50 BEGIN PROMPT 2 3 "Descrizione " HELP "Descrizione profilo utente" - COPY ALL F_CODE + USE LF_FORM KEY 2 + INPUT TIPOPROF F_BASE SELECT + INPUT DESC F_DESC + DISPLAY "Descrizione@50" DESC + DISPLAY "Profilo base" TIPOPROF + DISPLAY "Codice" CODPROF + COPY OUTPUT F_CODE FIELD DESC END diff --git a/ba/ba3700.cpp b/ba/ba3700.cpp index 2f3fb5273..bf72a5ab1 100755 --- a/ba/ba3700.cpp +++ b/ba/ba3700.cpp @@ -348,7 +348,7 @@ bool BA3700_application::tipo_rata(TMask_field& f, KEY k) TPagamento* pag = s->_pag; TSheet_field* shf = s->_sht; - if (k == K_TAB && pag) + if (k == K_TAB && pag && f.focusdirty()) { pag->set_default_ulc(""); f.mask().set(F_ULT_CLASS,""); diff --git a/ba/bastesc.uml b/ba/bastesc.uml index 241fc4706..47c804cfc 100755 --- a/ba/bastesc.uml +++ b/ba/bastesc.uml @@ -7,7 +7,7 @@ BEGIN PROMPT 2 1 "Ditta " FLAGS "FRD" END - + NUMBER F_INIZIO1 4 BEGIN PROMPT 2 3 "Da anno " @@ -21,6 +21,7 @@ BEGIN DISPLAY "Data fine esercizio" D1 OUTPUT F_INIZIO1 CODTAB GROUP 1 + ADD NONE END NUMBER F_FINE1 4 @@ -34,6 +35,7 @@ BEGIN COPY DISPLAY F_INIZIO1 OUTPUT F_FINE1 CODTAB GROUP 2 + ADD NONE END BUTTON DLG_OK 10 2 diff --git a/cg/cg1500a.uml b/cg/cg1500a.uml index d6ad666c6..bf9878f40 100755 --- a/cg/cg1500a.uml +++ b/cg/cg1500a.uml @@ -6,12 +6,12 @@ NUMBER F_CODDITTA 5 BEGIN PROMPT 2 1 "Ditta " FLAGS "FRD" - USE LF_NDITTE KEY 1 + USE LF_NDITTE KEY 1 CHECKTYPE REQUIRED INPUT CODDITTA F_CODDITTA DISPLAY "Codice" CODDITTA DISPLAY "Ragione sociale @50" RAGSOC - OUTPUT F_CODDITTA CODDITTA + OUTPUT F_CODDITTA CODDITTA OUTPUT F_RAGSOC RAGSOC END @@ -21,7 +21,7 @@ BEGIN FLAGS "D" END -DATE F_DATASTAMPA +DATE F_DATASTAMPA BEGIN PROMPT 48 1 "Data stampa " HELP "Data che verra' stampata sul bilancio" @@ -50,7 +50,7 @@ BEGIN MESSAGE HIDE,F_STAMPA1|RESET,F_STAMPA1|HIDE,F_VERIFICA|RESET,F_VERIFICA MESSAGE HIDE,F_STAMPAV|RESET,F_STAMPAV|HIDE,F_DATADA|RESET,F_DATADA MESSAGE HIDE,F_DATAA|RESET,F_DATAA|HIDE,F_SITUAZIONE|RESET,F_SITUAZIONE - MESSAGE HIDE,F_ORDINAMENTO|RESET,F_ORDINAMENTO|HIDE,F_STAMPAC|RESET,F_STAMPAC + MESSAGE HIDE,F_ORDINAMENTO|RESET,F_ORDINAMENTO|HIDE,F_STAMPAC|RESET,F_STAMPAC MESSAGE HIDE,96|HIDE,97|HIDE,98|HIDE,99 //MESSAGE HIDE,F_MODULO|RESET,F_MODULO MESSAGE SHOW,F_STAMPA|K_SPACE,F_STAMPA @@ -62,7 +62,7 @@ BEGIN MESSAGE SHOW,F_VERIFICA|K_SPACE,F_VERIFICA|SHOW,F_STAMPA1|K_SPACE,F_STAMPA1 //MESSAGE SHOW,F_MODULO|K_SPACE,F_MODULO MESSAGE SHOW,96|SHOW,97|SHOW,98|SHOW,99 -END +END RADIOBUTTON F_STAMPA 28 BEGIN @@ -85,27 +85,27 @@ BEGIN ITEM "2|All'ultima immissione" MESSAGE SHOW,F_VERIFICA|SHOW,F_MODULO|SHOW,F_STAMPAMPROV MESSAGE COPY,F_STAMPA -END +END DATE F_DATALIM BEGIN PROMPT 2 9 "Data limite " HELP "Data fino alla quale si vuole la stampa" -END +END -BOOLEAN F_TOTALI +BOOLEAN F_TOTALI BEGIN PROMPT 33 9 "Non stampare totali per gruppo " HELP "Indicare se non si devono stampare i totali dei gruppi" END -BOOLEAN F_CODICI +BOOLEAN F_CODICI BEGIN PROMPT 2 10 "Non stampare codici conti " HELP "Indicare se non si devono stampare i codici dei conti" END -BOOLEAN F_SALDO +BOOLEAN F_SALDO BEGIN PROMPT 33 10 "Non stampare movimenti con saldo a zero " HELP "Indicare se non si devono stampare i movimenti con saldo nullo" @@ -153,9 +153,9 @@ END LIST F_STAMPAMPROV 15 BEGIN PROMPT 2 11 "Bilancio " - ITEM "1|Normale" - ITEM "2|Globale" - ITEM "3|Solo provvisori" + ITEM "1|Normale" + ITEM "2|Globale" + ITEM "3|Solo provvisori" END LIST F_MODULO 8 @@ -183,7 +183,7 @@ END ENDPAGE -PAGE "Stampa bilancio di verifica" -1 -1 74 20 +PAGE "Parametri bilancio di verifica" -1 -1 74 20 RADIOBUTTON F_VERIFICA 27 BEGIN @@ -192,7 +192,7 @@ BEGIN ITEM "1|Bilancio" ITEM "2|Saldi di mastro" ITEM "3|Situazione C/F" -END +END RADIOBUTTON F_STAMPAC 35 BEGIN diff --git a/cg/cg4100b.uml b/cg/cg4100b.uml index b6242db2d..ba0ea9ebe 100755 --- a/cg/cg4100b.uml +++ b/cg/cg4100b.uml @@ -30,6 +30,7 @@ BEGIN FLAGS "Z" HELP "Codice esercizio per il quale si desidera il ricalcolo dei saldi" WARNING "Il codice esercizio e' obbligatorio" + ADD RUN cg0 -5 esc END diff --git a/cg/cg4600a.uml b/cg/cg4600a.uml index db7fd368d..1fd495304 100755 --- a/cg/cg4600a.uml +++ b/cg/cg4600a.uml @@ -74,6 +74,7 @@ BEGIN CHECKTYPE REQUIRED WARNING "Codice non presente in tabella esercizi" FLAGS "GRZD" + ADD RUN cg0 -5 esc END NUMBER F_ANNO 4 @@ -87,6 +88,7 @@ BEGIN CHECKTYPE REQUIRED WARNING "Anno non presente in tabella esercizi" FLAGS "GRZD" + ADD RUN cg0 -5 esc END diff --git a/cg/cg5200a.uml b/cg/cg5200a.uml index d3972bf08..219f95afc 100755 --- a/cg/cg5200a.uml +++ b/cg/cg5200a.uml @@ -20,6 +20,7 @@ BEGIN DISPLAY "Data fine esercizio" D1 OUTPUT F_ANNO CODTAB[1,4] FLAGS "Z" + ADD RUN cg0 -5 esc END BOOLEAN F_SCARICATO diff --git a/cg/cg5400a.uml b/cg/cg5400a.uml index 9bb0ccfdb..7df713135 100755 --- a/cg/cg5400a.uml +++ b/cg/cg5400a.uml @@ -53,6 +53,7 @@ BEGIN CHECKTYPE REQUIRED HELP "Esercizio da cui ripristinare la stampa" WARNING "Esercizio assente" + ADD RUN cg0 -5 esc END STRING F_REG 3