From 2986659318d340842dd3fd573990918246e4903d Mon Sep 17 00:00:00 2001 From: lvietri Date: Mon, 4 Aug 2008 11:09:19 +0000 Subject: [PATCH] Patch level : Files correlati : Ricompilazione Demo : [ ] Commento : git-svn-id: svn://10.65.10.50/trunk@16994 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- lv/f164.trr | 2 +- lv/lv0500a.h | 39 ++++++------- lv/lv0500a.uml | 147 +++++++++++-------------------------------------- 3 files changed, 52 insertions(+), 136 deletions(-) diff --git a/lv/f164.trr b/lv/f164.trr index 0a28655ac..b6eff9f65 100755 --- a/lv/f164.trr +++ b/lv/f164.trr @@ -1,7 +1,7 @@ 164 16 IDCONTR|1|3|0|Codice identificativo di un contratto -CODCF|3|6|0|Codice identificativo di un cliente o fornitore +CODCF|3|6|0|Codice identificativo di un cliente GGCONS|2|1|0|Giorno di consegna CODITI|1|3|0|Codice dell'itinerario USERINS|1|16|0|Utente d'inserimento diff --git a/lv/lv0500a.h b/lv/lv0500a.h index c637ce3f0..05e1f4e1a 100755 --- a/lv/lv0500a.h +++ b/lv/lv0500a.h @@ -1,24 +1,21 @@ #define F_CODDITTA 101 #define F_RAGSOCDITTA 102 -#define F_PROVV 103 -#define F_CODNUM 104 -#define F_DESNUM 105 -#define F_ANNO 108 -#define F_NDOC 109 -#define F_GGCONS 110 -#define F_CODITI 111 -#define F_DES_ITI 112 -#define F_USERINS 113 -#define F_DATAINS 114 -#define F_USERAGG 115 -#define F_DATAAGG 116 -#define F_TIPOCF 117 -#define F_CODCF 118 -#define F_ORDFERM 119 -#define F_CODFRQCONS 120 -#define F_DES_FRQCONS 121 -#define F_MODPASS 122 -#define F_FLAGSTAG 123 -#define F_ORAARR 124 -#define F_NOTE 125 +#define F_CODCF 103 +#define F_RAGSOC_CLI 104 +#define F_IDCONTR 105 +#define F_DES_IDCONTR 106 +#define F_GGCONS 107 +#define F_CODITI 108 +#define F_DES_ITI 109 +#define F_USERINS 110 +#define F_DATAINS 111 +#define F_USERAGG 112 +#define F_DATAAGG 113 +#define F_ORDFERM 114 +#define F_CODFRQCONS 115 +#define F_DES_FRQCONS 116 +#define F_MODPASS 117 +#define F_FLAGSTAG 118 +#define F_ORAARR 119 +#define F_NOTE 120 diff --git a/lv/lv0500a.uml b/lv/lv0500a.uml index 6c64486a7..7218e1231 100755 --- a/lv/lv0500a.uml +++ b/lv/lv0500a.uml @@ -32,90 +32,45 @@ BEGIN PROMPT 1 4 "" END -LISTBOX F_PROVV 14 -BEGIN - FIELD PROVV - PROMPT 46 7 "Tipo " - ITEM "D|Definitiva " - ITEM "P|Provvisoria" - KEY 1 - FLAGS "DPG" - FIELD PROVV -END -STRING F_CODNUM 4 +NUMBER F_CODCF 6 BEGIN - PROMPT 2 6 "Numerazione " - FIELD CODNUM - FLAGS "U" + PROMPT 2 5 "Codice " + FIELD CODCF + FLAGS "B" KEY 1 - HELP "Codice numerazione" - USE %NUM - INPUT CODTAB F_CODNUM - DISPLAY "Codice" CODTAB - DISPLAY "Descrizione@50" S0 - OUTPUT F_CODNUM CODTAB - OUTPUT F_DESNUM S0 - CHECKTYPE FORCED - WARNING "Numerazione assente" -END - -STRING F_DESNUM 50 -BEGIN - PROMPT 24 6 "" - HELP "Descrizione numerazione" - USE %NUM KEY 2 - INPUT S0 F_DESNUM - DISPLAY "Descrizione@50" S0 - DISPLAY "Codice" CODTAB - COPY OUTPUT F_CODNUM - FLAGS "" -END - -NUMBER F_ANNO 4 -BEGIN - PROMPT 2 7 "Esercizio " - FIELD ANNO - CHECKTYPE REQUIRED - NUM_EXPR #F_ANNO>0 - FLAGS "AP" - KEY 1 - WARNING "Inserire un anno valido" -END - -NUMBER F_NDOC 6 -BEGIN - PROMPT 24 7 "Numero " - FIELD NDOC - FLAGS "R" - KEY 1 - USE LF_DOC - JOIN LF_CLIFO TO LF_DOC INTO TIPOCF==TIPOCF CODCF==CODCF - INPUT PROVV F_PROVV SELECT - INPUT ANNO F_ANNO SELECT - INPUT CODNUM F_CODNUM SELECT - INPUT NDOC F_NDOC - DISPLAY "Num." CODNUM - DISPLAY "Anno" ANNO - DISPLAY "Provv" PROVV - DISPLAY "Tipo" TIPODOC - DISPLAY "N.Doc. " NDOC - DISPLAY "Stato@R" STATO - DISPLAY "Data\ndocumento" DATADOC - DISPLAY "C/F" TIPOCF + USE LF_CLIFO SELECT TIPOCF = "C" + INPUT CODCF F_CODCF DISPLAY "Codice" CODCF - DISPLAY "Ragione Sociale@50" LF_CLIFO->RAGSOC - OUTPUT F_CODNUM CODNUM - OUTPUT F_NDOC NDOC - OUTPUT F_PROVV PROVV - OUTPUT F_CODCF CODCF - OUTPUT F_TIPOCF TIPOCF - CHECKTYPE REQUIRED + DISPLAY "Ragione Sociale@50" RAGSOC + OUTPUT F_CODCF CODCF + OUTPUT F_RAGSOC_CLI RAGSOC + CHECKTYPE REQUIRED +END + +STRING F_RAGSOC_CLI 50 +BEGIN + PROMPT 20 5 "" + FLAGS "D" +END + +STRING F_IDCONTR 3 +BEGIN + PROMPT 2 7 "Contratto N." + FLAGS "B" + FIELD IDCONTR + KEY 1 +END + +STRING F_DES_IDCONTR 50 +BEGIN + PROMPT 20 7 "" + FLAGS "D" END NUMBER F_GGCONS 1 BEGIN - PROMPT 2 8 "Giorno di consegna" + PROMPT 2 9 "Giorno di consegna" FIELD GGCONS KEY 1 CHECKTYPE REQUIRED @@ -124,7 +79,7 @@ END STRING F_CODITI 3 BEGIN - PROMPT 22 8 "Cod.Itinerario" + PROMPT 22 9 "Cod.Itinerario" FIELD CODITI FLAGS "U" KEY 1 @@ -139,46 +94,10 @@ END STRING F_DES_ITI 35 BEGIN - PROMPT 42 8 "" + PROMPT 42 9 "" FLAGS "D" END -LIST F_TIPOCF 1 12 -BEGIN - PROMPT 2 11 "Tipo " - ITEM "C|Cliente" - ITEM "F|Fornitore" - FIELD TIPOCF - FLAGS "D" -END - -NUMBER F_CODCF 6 -BEGIN - PROMPT 24 11 "Codice " - FIELD CODCF - FLAGS "D" - USE LF_DOC SELECT (CODNUM==#F_CODNUM) && (PROVV==#F_PROVV) && (ANNO==#F_ANNO) - JOIN LF_CLIFO INTO TIPOCF==TIPOCF CODCF==CODCF - INPUT TIPOCF F_TIPOCF SELECT - INPUT CODCF F_CODCF - INPUT PROVV F_PROVV - INPUT ANNO F_ANNO - DISPLAY "Codice" CODCF - DISPLAY "Ragione Sociale@50" LF_CLIFO->RAGSOC - DISPLAY "Partita IVA@12" LF_CLIFO->PAIV - DISPLAY "Num." CODNUM - DISPLAY "Anno" ANNO - DISPLAY "Provv" PROVV - DISPLAY "Tipo" TIPODOC - DISPLAY "N.Doc. " NDOC - DISPLAY "Data\ndocumento" DATADOC - DISPLAY "Valuta" CODVAL - DISPLAY "Totale\ndocumento@18V" G1:TOTDOC - COPY OUTPUT F_NDOC - OUTPUT F_CODCF CODCF - CHECKTYPE NORMAL -END - GROUPBOX DLG_NULL 80 5 BEGIN PROMPT 1 12 ""