From bf903e9cf2760c5c30eb445f72ea3e1af2cafce4 Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 17 Sep 1996 09:42:37 +0000 Subject: [PATCH] Correzzioni git-svn-id: svn://10.65.10.50/trunk@3594 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ve/batbmag.uml | 2 +- ve/batbprs.uml | 38 +++++++++++++++++++++++++++----------- ve/batbspp.uml | 12 ++++++------ ve/batbtri.uml | 2 +- ve/verig.uml | 9 +++++---- ve/verig07.uml | 13 +++++++++++++ ve/verig08.uml | 13 +++++++++++++ ve/verig09.uml | 27 +++++++++++++++++++++++++++ 8 files changed, 93 insertions(+), 23 deletions(-) create mode 100755 ve/verig07.uml create mode 100755 ve/verig08.uml create mode 100755 ve/verig09.uml diff --git a/ve/batbmag.uml b/ve/batbmag.uml index ba2da8c92..88e2e9545 100755 --- a/ve/batbmag.uml +++ b/ve/batbmag.uml @@ -230,7 +230,7 @@ LISTBOX F_NATMAG 1 50 BEGIN PROMPT 2 17 "Natura del magazzino " FIELD MAG->I2 -ITEM "1|Proprietà dell'azienda " +ITEM "1|Proprieta' dell'azienda " ITEM "2|Materiale nostro in lavorazione presso terzi" ITEM "3|Materiale nostro in deposito presso terzi" ITEM "4|Materiale di terzi in lavorazione presso l'azienda" diff --git a/ve/batbprs.uml b/ve/batbprs.uml index d5f61327d..09d01484d 100755 --- a/ve/batbprs.uml +++ b/ve/batbprs.uml @@ -82,15 +82,31 @@ BEGIN FLAG "D" END -NUMBER F_PREZZO 13 2 +LISTBOX F_CAMPI 15 BEGIN - PROMPT 2 10 "Prezzo " + PROMPT 2 10 "Campo default " + FIELD S6 + ITEM "Q|Qta prezzo " + MESSAGE ENABLE,F_QTA + ITEM "V|Valore " + MESSAGE CLEAR,F_QTA +END + +NUMBER F_PREZZO 15 3 +BEGIN + PROMPT 2 12 "Prezzo " FIELD R0 END +NUMBER F_QTA 13 5 +BEGIN + PROMPT 35 12 "Quantita' " + FIELD R1 +END + STRING F_UM 2 BEGIN - PROMPT 35 10 "U.M. " + PROMPT 63 12 "U.M. " FIELD S7 FLAGS "U" USE %UMS @@ -103,14 +119,14 @@ END NUMBER F_GRUPPOV 3 BEGIN - PROMPT 2 12 "Conto vendita " + PROMPT 2 14 "Conto vendita " FIELD I0 CHECKTYPE NORMAL END NUMBER F_CONTOV 3 BEGIN - PROMPT 22 12 "" + PROMPT 22 14 "" FIELD I1 USE LF_PCON SELECT INDBIL=="4" INPUT GRUPPO F_GRUPPOV @@ -127,7 +143,7 @@ BEGIN NUMBER F_SOTTOV 6 BEGIN - PROMPT 30 12 "" + PROMPT 30 14 "" FIELD I2 USE LF_PCON INPUT GRUPPO F_GRUPPOV SELECT @@ -148,20 +164,20 @@ END STRING F_DESCRCONTOV 50 BEGIN - PROMPT 17 13 "" + PROMPT 17 15 "" FLAG "D" END NUMBER F_GRUPPOA 3 BEGIN - PROMPT 2 14 "Conto acquisti " + PROMPT 2 16 "Conto acquisti " FIELD I3 CHECKTYPE NORMAL END NUMBER F_CONTOA 3 BEGIN - PROMPT 22 14 "" + PROMPT 22 16 "" FIELD I4 USE LF_PCON SELECT INDBIL=="3" INPUT GRUPPO F_GRUPPOA @@ -178,7 +194,7 @@ BEGIN NUMBER F_SOTTOA 6 BEGIN - PROMPT 30 14 "" + PROMPT 30 16 "" FIELD I5 USE LF_PCON INPUT GRUPPO F_GRUPPOA SELECT @@ -199,7 +215,7 @@ END STRING F_DESCRCONTOA 50 BEGIN - PROMPT 17 15 "" + PROMPT 17 17 "" FLAG "D" END diff --git a/ve/batbspp.uml b/ve/batbspp.uml index 756cd1ed1..0a0134375 100755 --- a/ve/batbspp.uml +++ b/ve/batbspp.uml @@ -87,21 +87,21 @@ BEGIN PROMPT 2 10 "Campo default " FIELD S6 ITEM "Q|Qta prezzo " - MESSAGE SHOW,1@|ENABLE,2@|RESET,2@|HIDE,3@|RESET,3@ + MESSAGE SHOW,1@|ENABLE,2@|HIDE,3@|RESET,3@ ITEM "V|Valore " - MESSAGE SHOW,1@|"1",F_QTA|DISABLE,2@|HIDE,3@|RESET,3@ + MESSAGE SHOW,1@|CLEAR,2@|HIDE,3@|RESET,3@ ITEM "P|Percentuale " MESSAGE SHOW,3@|HIDE,1@|RESET,1@ END -NUMBER F_PREZZO 13 2 +NUMBER F_PREZZO 15 3 BEGIN PROMPT 2 11 "Prezzo " FIELD R0 GROUP 1 END -NUMBER F_QTA 13 2 +NUMBER F_QTA 13 5 BEGIN PROMPT 35 11 "Quantita' " FIELD R1 @@ -179,7 +179,7 @@ NUMBER F_SOTTOV 6 BEGIN PROMPT 30 15 "" FIELD I2 - USE LF_PCON SELECT (SOTTOCONTO!="") && ($-500->INDBIL=="4") + USE LF_PCON SELECT (SOTTOCONTO!="") && (500@->INDBIL=="4") JOIN LF_PCON ALIAS 500 INTO GRUPPO==GRUPPO CONTO==CONTO INPUT GRUPPO F_GRUPPOV INPUT CONTO F_CONTOV @@ -231,7 +231,7 @@ NUMBER F_SOTTOA 6 BEGIN PROMPT 30 17 "" FIELD I5 - USE LF_PCON SELECT (SOTTOCONTO!="") && ($-500->INDBIL=="3") + USE LF_PCON SELECT (SOTTOCONTO!="") && (500@->INDBIL=="3") JOIN LF_PCON ALIAS 500 INTO GRUPPO==GRUPPO CONTO==CONTO INPUT GRUPPO F_GRUPPOA INPUT CONTO F_CONTOA diff --git a/ve/batbtri.uml b/ve/batbtri.uml index 1e89805cd..4744a70f5 100755 --- a/ve/batbtri.uml +++ b/ve/batbtri.uml @@ -1,7 +1,7 @@ #include "batbtri.h" TOOLBAR "" 0 20 60 2 - #include "toolbar.h" +#include "toolbar.h" ENDPAGE PAGE "Tipo di riga" -1 -1 60 14 diff --git a/ve/verig.uml b/ve/verig.uml index a295a2cc2..fe652a144 100755 --- a/ve/verig.uml +++ b/ve/verig.uml @@ -189,7 +189,6 @@ ENDIF OUTPUT FR_CODSPV CODTAB OUTPUT FR_DESCRSPV S0 OUTPUT FR_VALORE R0 - OUTPUT FR_QTA R1 OUTPUT FR_UMQTASP S7 OUTPUT FR_CODIVA S3 MESSAGE DIRTY,FR_CODIVA|K_TAB,FR_CODIVA|DISABLE,FR_QTA @@ -216,6 +215,7 @@ ENDIF DISPLAY "Descrizione@50" S0 OUTPUT FR_CODSPQ CODTAB OUTPUT FR_DESCRSPQ S0 + OUTPUT FR_QTA R1 OUTPUT FR_PREZZO R0 OUTPUT FR_UMQTASP S7 OUTPUT FR_CODIVA S3 @@ -270,6 +270,7 @@ ENDIF OUTPUT FR_CODPRS CODTAB OUTPUT FR_DESCRPRS S0 OUTPUT FR_PREZZO R0 + OUTPUT FR_QTA R1 OUTPUT FR_UMQTASP S7 OUTPUT FR_CODIVA S3 MESSAGE DIRTY,FR_CODIVA|K_TAB,FR_CODIVA @@ -427,12 +428,12 @@ END ENDIF IFDEF(F_QTA) -NUMBER FR_QTA 11 3 +NUMBER FR_QTA 13 5 BEGIN IFDEF(X_QTA) PROMPT X_QTA Y_QTA PR_QTA ELSEIF - PROMPT 22 9 "Qta' " + PROMPT 22 9 "Qta' " ENDIF FIELD QTA END @@ -444,7 +445,7 @@ BEGIN IFDEF(X_PERCSP) PROMPT X_PERCSP Y_PERCSP PR_PERCSP ELSEIF - PROMPT 22 9 "%Spesa " + PROMPT 2 9 " % " ENDIF FIELD PSPESA END diff --git a/ve/verig07.uml b/ve/verig07.uml new file mode 100755 index 000000000..7c382d18f --- /dev/null +++ b/ve/verig07.uml @@ -0,0 +1,13 @@ +#include "verigdef.h" + +#define FULL_SCREEN + +#define MASK_TITLE1 "Sconto ad importo" + +DEFINE_FIELD(DESCR) +DEFINE_FIELD(VALORE) +DEFINE_FIELD(CODIVA) +DEFINE_FIELD(DESIVA) + +#include "verig.uml" + diff --git a/ve/verig08.uml b/ve/verig08.uml new file mode 100755 index 000000000..d7c85bcae --- /dev/null +++ b/ve/verig08.uml @@ -0,0 +1,13 @@ +#include "verigdef.h" + +#define FULL_SCREEN + +#define MASK_TITLE1 "Sconto percentuale" + +DEFINE_FIELD(DESCR) +DEFINE_FIELD(SCONTO) +DEFINE_FIELD(CODIVA) +DEFINE_FIELD(DESIVA) + +#include "verig.uml" + diff --git a/ve/verig09.uml b/ve/verig09.uml new file mode 100755 index 000000000..9dfd77d51 --- /dev/null +++ b/ve/verig09.uml @@ -0,0 +1,27 @@ +#include "verigdef.h" + +#define FULL_SCREEN +// else +// #define MASK_WIDTH 60 +// #define MASK_HEIGHT 14 +// +#define MASK_TITLE1 "Omaggio" + + +DEFINE_FIELD(CODMAG) +// F_POS(CODMAG, 2, 3, "Magazzino ") +// F_FLG(CODMAG, "U") +// F_CHK(CODMAG, REQUIRED) +DEFINE_FIELD(DESMAG) +DEFINE_FIELD(CODDEP) +DEFINE_FIELD(DESDEP) +DEFINE_FIELD(CODART) +DEFINE_FIELD(DESCRART) +DEFINE_FIELD(UMQTA) +DEFINE_FIELD(QTA) +DEFINE_FIELD(PREZZO) +DEFINE_FIELD(CODIVA) +DEFINE_FIELD(DESIVA) + +#include "verig.uml" +