From b68cafea5fa8a91363e3d1c587f26d34c3a56608 Mon Sep 17 00:00:00 2001 From: luca Date: Tue, 11 Mar 2003 16:13:49 +0000 Subject: [PATCH] Patch level :nopatch Files correlati : Ricompilazione Demo : [ ] Commento :aggiunti campi mancanti alla maschera (in pratica allineata alla versione 1.7 aga) git-svn-id: svn://10.65.10.50/trunk@10903 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- or/or1100a.uml | 225 +++++++++++++++++++++++++++++++------------------ 1 file changed, 142 insertions(+), 83 deletions(-) diff --git a/or/or1100a.uml b/or/or1100a.uml index 8229a687a..47d9ba9ad 100755 --- a/or/or1100a.uml +++ b/or/or1100a.uml @@ -1,6 +1,6 @@ #include "or1100a.h" -TOOLBAR "" 0 19 0 4 +TOOLBAR "" 0 20 0 4 BUTTON DLG_PRINT 10 2 BEGIN @@ -14,19 +14,19 @@ END ENDPAGE -PAGE "Stampa ordini" -1 -1 78 20 +PAGE "Stampa ordini" -1 -1 78 21 RADIOBUTTON F_TIPO 30 BEGIN PROMPT 2 1 "Tipo stampa" ITEM "0|Numero/Data" - MESSAGE DISABLE,GR_TUTTI@|HIDE,GR_AGE@|SHOW,GR_CLIFO@|ENABLE,F_DATA_O_NUM|ENABLE,F_DETTAGLIO|" ",F_DETTAGLIO|CLEAR,GR_DETAIL@|CLEAR,GR_DETAILART@ + MESSAGE DISABLE,GR_TUTTI@|HIDE,GR_AGE@|SHOW,GR_CLIFO@|ENABLE,F_DATA_O_NUM|ENABLE,F_DETTAGLIO|" ",F_DETTAGLIO|CLEAR,GR_DETAIL@|"X",F_OPZ_VALORE|CLEAR,GR_DETAILART@ ITEM "1|Cliente/Fornitore" - MESSAGE DISABLE,GR_TUTTI@|HIDE,GR_AGE@|SHOW,GR_CLIFO@|ENABLE,GR_CLIFO@|DISABLE,F_DATA_O_NUM|"D", F_DATA_O_NUM|ENABLE,F_DETTAGLIO|" ",F_DETTAGLIO|CLEAR,GR_DETAIL@ + MESSAGE DISABLE,GR_TUTTI@|HIDE,GR_AGE@|SHOW,GR_CLIFO@|ENABLE,GR_CLIFO@|DISABLE,F_DATA_O_NUM|"D", F_DATA_O_NUM|ENABLE,F_DETTAGLIO|" ",F_DETTAGLIO|CLEAR,GR_DETAIL@|CLEAR,GR_DETAILART@ ITEM "2|Agente" - MESSAGE DISABLE,GR_TUTTI@|HIDE,GR_CLIFO@|SHOW,GR_AGE@|ENABLE,GR_AGE@|DISABLE,F_DATA_O_NUM|"D", F_DATA_O_NUM|ENABLE,F_DETTAGLIO|" ",F_DETTAGLIO|CLEAR,GR_DETAIL@|ENABLE,F_DETAIL_BY_CLI + MESSAGE DISABLE,GR_TUTTI@|HIDE,GR_CLIFO@|SHOW,GR_AGE@|ENABLE,GR_AGE@|DISABLE,F_DATA_O_NUM|"D", F_DATA_O_NUM|ENABLE,F_DETTAGLIO|" ",F_DETTAGLIO|CLEAR,GR_DETAIL@|CLEAR,GR_DETAILART@|ENABLE,F_DETAIL_BY_CLI ITEM "3|Articolo" - MESSAGE DISABLE,GR_TUTTI@|HIDE,GR_AGE@|SHOW,GR_CLIFO@|DISABLE,F_DATA_O_NUM|"D", F_DATA_O_NUM|DISABLE,F_DETTAGLIO|"X",F_DETTAGLIO|ENABLE,GR_CLIFO@|CLEAR,GR_DETAIL@ + MESSAGE DISABLE,GR_TUTTI@|HIDE,GR_AGE@|SHOW,GR_CLIFO@|DISABLE,F_DATA_O_NUM|"D", F_DATA_O_NUM|DISABLE,F_DETTAGLIO|"X",F_DETTAGLIO|ENABLE,GR_CLIFO@|ENABLE,GR_ART@|ENABLE,GR_DETAILART@|ENABLE,GR_DETAIL@|DISABLE,F_DETAIL_BY_DOC END GROUPBOX DLG_NULL 40 6 @@ -208,63 +208,13 @@ BEGIN PROMPT 3 11 "Dettaglio righe" END - -BOOLEAN F_DETAIL_BY_DOC -BEGIN - PROMPT 35 11 "Dettaglio per documento" - FLAGS "D" - MESSAGE TRUE DISABLE,GR_DETAILART@ - MESSAGE FALSE ENABLE,GR_DETAILART@ - GROUP GR_DETAIL -END - BOOLEAN F_DETAIL_BY_CLI BEGIN - PROMPT 35 12 "Ordina per cliente" + PROMPT 37 11 "Ordina per cliente" FLAGS "D" GROUP GR_TUTTI END - -NUMBER F_DETAIL_LEV 1 -BEGIN - PROMPT 35 13 "Livello dettaglio " - FLAGS "D" - GROUP GR_DETAILART - USE FCG - INPUT CODTAB F_DETAIL_LEV - DISPLAY "Codice" CODTAB - DISPLAY "Descrizione livello@50" S0 - OUTPUT F_DETAIL_LEV CODTAB - CHECKTYPE NORMAL -END - -LIST F_RAGG_PER_ART 12 -BEGIN - PROMPT 35 14 "Periodo raggruppamento " - ITEM "0|Giornaliero" - ITEM "1|1 mese" - ITEM "2|2 mesi" - ITEM "3|3 mesi" - ITEM "4|4 mesi" - FLAGS "D" - GROUP GR_DETAILART -END - -BOOLEAN F_DETAIL_MAG -BEGIN - PROMPT 35 15 "Dettaglia magazzini" - FLAGS "D" - GROUP GR_DETAILART -END - -BOOLEAN F_DETAIL_DEP -BEGIN - PROMPT 35 16 "Dettaglia depositi" - FLAGS "D" - GROUP GR_DETAILART -END - LIST F_STATOORD 6 BEGIN PROMPT 3 12 "Tipo ordini " @@ -273,14 +223,57 @@ BEGIN ITEM "A|Aperti" END +BOOLEAN F_DETAIL_BY_DOC +BEGIN + PROMPT 37 12 "Dettaglio per documento" + FLAGS "D" + MESSAGE TRUE DISABLE,GR_DETAILART@ + MESSAGE FALSE ENABLE,GR_DETAILART@ + GROUP GR_DETAIL +END + LIST F_STATORORD 6 BEGIN PROMPT 3 13 "Tipo righe ordini " FLAGS "D" GROUP GR_DETAIL ITEM "T|Tutte" + MESSAGE DISABLE, F_FORCE_EVASE ITEM "E|Evase" + MESSAGE ENABLE, F_FORCE_EVASE ITEM "A|Aperte" + MESSAGE DISABLE, F_FORCE_EVASE +END + +NUMBER F_DETAIL_LEV 1 +BEGIN + PROMPT 37 13 "Livello dettaglio " + FLAGS "D" + GROUP GR_DETAILART + USE FCG + INPUT CODTAB F_DETAIL_LEV + DISPLAY "Codice" CODTAB + DISPLAY "Descrizione livello@50" S0 + OUTPUT F_DETAIL_LEV CODTAB + CHECKTYPE NORMAL +END + +BOOLEAN F_FORCE_EVASE +BEGIN + PROMPT 3 14 "Stampa righe evase con residuo" + FLAGS "D" +END + +LIST F_RAGG_PER_ART 12 +BEGIN + PROMPT 37 14 "Periodo raggruppamento " + ITEM "0|Giornaliero" + ITEM "1|1 mese" + ITEM "2|2 mesi" + ITEM "3|3 mesi" + ITEM "4|4 mesi" + FLAGS "D" + GROUP GR_DETAILART END GROUPBOX DLG_NULL 30 4 @@ -297,7 +290,6 @@ BEGIN DISPLAY "Codice@20" CODART DISPLAY "Descrizione@50" DESCR OUTPUT F_ARTFROM CODART - CHECKTYPE NORMAL ADD RUN ve2 -3 GROUP GR_DETAIL GR_ART END @@ -311,11 +303,47 @@ BEGIN DISPLAY "Codice@20" CODART DISPLAY "Descrizione@50" DESCR OUTPUT F_ARTTO CODART - CHECKTYPE NORMAL ADD RUN ve2 -3 GROUP GR_DETAIL GR_ART END +BOOLEAN F_DETAIL_MAG +BEGIN + PROMPT 37 16 "Dettaglia magazzini" + FLAGS "D" + GROUP GR_DETAILART +END + +BOOLEAN F_DETAIL_DEP +BEGIN + PROMPT 37 17 "Dettaglia depositi" + FLAGS "D" + GROUP GR_DETAILART +END + +BOOLEAN F_OPZ_VALORE +BEGIN + PROMPT 3 19 "Visualizza colonne valori" +END + +BOOLEAN F_OPZ_PREZZO +BEGIN + PROMPT 3 20 "Visualizza colonna prezzo" + GROUP GR_DETAIL GR_ART +END + +BOOLEAN F_OPZ_RESIDUO +BEGIN + PROMPT 37 19 "Visualizza colonna residuo" + GROUP GR_DETAIL GR_ART +END + +BOOLEAN F_OPZ_GIACENZA +BEGIN + PROMPT 37 20 "Visualizza colonna giacenza" + GROUP GR_DETAIL GR_ART +END + ENDPAGE @@ -323,12 +351,12 @@ PAGE "Avanzate" -1 -1 78 20 GROUPBOX DLG_NULL 74 10 BEGIN - PROMPT 2 2 "Livelli di giacenza" + PROMPT 1 1 "Livelli di giacenza" END STRING F_GIAC1 1 BEGIN - PROMPT 3 3 "1. " + PROMPT 3 2 "1. " FLAGS "D" USE FCG INPUT CODTAB[1,1] F_GIAC1 @@ -338,13 +366,13 @@ END STRING F_GIAC1_DES 60 BEGIN - PROMPT 12 3 "" + PROMPT 12 2 "" FLAGS "D" END STRING F_GIAC1_FROM 24 BEGIN - PROMPT 12 4 "Da " + PROMPT 12 3 "Da " FLAGS "D" KEY 1 USE GCG SELECT CODTAB[1,1]=#F_GIAC1 @@ -362,7 +390,7 @@ END STRING F_GIAC1_TO 23 BEGIN - PROMPT 47 4 "A " + PROMPT 47 3 "A " FLAGS "D" KEY 1 USE GCG SELECT CODTAB[1,1]=#F_GIAC1 @@ -380,7 +408,7 @@ END STRING F_GIAC2 1 BEGIN - PROMPT 3 5 "2. " + PROMPT 3 4 "2. " FLAGS "D" USE FCG INPUT CODTAB[1,1] F_GIAC2 @@ -390,13 +418,13 @@ END STRING F_GIAC2_DES 60 BEGIN - PROMPT 12 5 "" + PROMPT 12 4 "" FLAGS "D" END STRING F_GIAC2_FROM 23 BEGIN - PROMPT 12 6 "Da " + PROMPT 12 5 "Da " FLAGS "D" KEY 1 USE GCG SELECT CODTAB[1,1]=#F_GIAC2 @@ -414,7 +442,7 @@ END STRING F_GIAC2_TO 23 BEGIN - PROMPT 47 6 "A " + PROMPT 47 5 "A " FLAGS "D" KEY 1 USE GCG SELECT CODTAB[1,1]=#F_GIAC2 @@ -432,7 +460,7 @@ END STRING F_GIAC3 1 BEGIN - PROMPT 3 7 "3. " + PROMPT 3 6 "3. " USE FCG INPUT CODTAB[1,1] F_GIAC3 OUTPUT F_GIAC3_DES S0 @@ -442,13 +470,13 @@ END STRING F_GIAC3_DES 60 BEGIN - PROMPT 12 7 "" + PROMPT 12 6 "" FLAGS "D" END STRING F_GIAC3_FROM 23 BEGIN - PROMPT 12 8 "Da " + PROMPT 12 7 "Da " FLAGS "D" KEY 1 USE GCG SELECT CODTAB[1,1]=#F_GIAC3 @@ -466,7 +494,7 @@ END STRING F_GIAC3_TO 23 BEGIN - PROMPT 47 8 "A " + PROMPT 47 7 "A " FLAGS "D" KEY 1 USE GCG SELECT CODTAB[1,1]=#F_GIAC3 @@ -484,7 +512,7 @@ END STRING F_GIAC4 1 BEGIN - PROMPT 3 9 "4. " + PROMPT 3 8 "4. " USE FCG INPUT CODTAB[1,1] F_GIAC4 OUTPUT F_GIAC4_DES S0 @@ -494,13 +522,13 @@ END STRING F_GIAC4_DES 60 BEGIN - PROMPT 12 9 "" + PROMPT 12 8 "" FLAGS "D" END STRING F_GIAC4_FROM 23 BEGIN - PROMPT 12 10 "Da " + PROMPT 12 9 "Da " FLAGS "D" KEY 1 USE GCG SELECT CODTAB[1,1]=#F_GIAC4 @@ -518,7 +546,7 @@ END STRING F_GIAC4_TO 23 BEGIN - PROMPT 47 10 "A " + PROMPT 47 9 "A " FLAGS "D" KEY 1 USE GCG SELECT CODTAB[1,1]=#F_GIAC4 @@ -534,14 +562,45 @@ BEGIN GROUP GR_DETAIL END -GROUPBOX DLG_NULL 30 4 +BOOLEAN F_PRINTSPESE BEGIN - PROMPT 2 15 "Magazzino" + PROMPT 2 12 "Includi le righe spese" + GROUP GR_PRINT +END + +BOOLEAN F_PRINTPREST +BEGIN + PROMPT 2 13 "Includi le righe prestazioni" + GROUP GR_PRINT +END + +BOOLEAN F_PRINTDESCR +BEGIN + PROMPT 2 14 "Includi le righe descrizione" + GROUP GR_PRINT +END + +BOOLEAN F_PRINTSCONTI +BEGIN + PROMPT 36 12 "Includi le righe sconti" + GROUP GR_PRINT +END + +BOOLEAN F_PRINTOMAGGI +BEGIN + PROMPT 36 13 "Includi le righe omaggio" + GROUP GR_PRINT +END + +GROUPBOX DLG_NULL 32 4 +BEGIN + PROMPT 1 16 "Magazzino" + GROUP GR_PRINT END STRING F_MAGFROM 3 BEGIN - PROMPT 3 16 "Dal " + PROMPT 3 17 "Dal " FLAGS "DU" USE MAG SELECT CODTAB[4,5]=="" INPUT CODTAB F_MAGFROM @@ -554,7 +613,7 @@ END STRING F_MAGTO 3 BEGIN - PROMPT 3 17 "Al " + PROMPT 3 18 "Al " FLAGS "DU" USE MAG SELECT CODTAB[4,5]=="" INPUT CODTAB F_MAGTO @@ -567,12 +626,12 @@ END GROUPBOX DLG_NULL 40 4 BEGIN - PROMPT 35 15 "Deposito" + PROMPT 35 16 "Deposito" END STRING F_DEPFROM 2 BEGIN - PROMPT 36 16 "Dal " + PROMPT 36 17 "Dal " FLAGS "DU" USE MAG SELECT CODTAB[4,5]!="" INPUT CODTAB[1,3] F_MAGFROM @@ -587,7 +646,7 @@ END STRING F_DEPTO 2 BEGIN - PROMPT 36 17 "Al " + PROMPT 36 18 "Al " FLAGS "DU" USE MAG SELECT CODTAB[4,5]!="" INPUT CODTAB[1,3] F_MAGTO