From cab0ae6f981c94bf3384122af2f2f189ee5a8fa7 Mon Sep 17 00:00:00 2001
From: rajitgill <rajitgill@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Tue, 28 Oct 2008 09:31:27 +0000
Subject: [PATCH] Patch level         : Files correlati     : Ricompilazione
 Demo : [ ] Commento            :

git-svn-id: svn://10.65.10.50/trunk@17486 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 lv/lv0300a.uml |  39 +++++---
 lv/lv0400a.uml | 252 +++++++++++++++++++++++++------------------------
 2 files changed, 154 insertions(+), 137 deletions(-)

diff --git a/lv/lv0300a.uml b/lv/lv0300a.uml
index 196f9b09d..571c714ef 100755
--- a/lv/lv0300a.uml
+++ b/lv/lv0300a.uml
@@ -84,9 +84,14 @@ BEGIN
   COPY OUTPUT F_TIPODOC_GEN
 END
 
+GROUPBOX DLG_NULL 78 4
+BEGIN
+	PROMPT 1 5 "@bFatture"
+END
+
 STRING F_CODNUM_FAT 4
 BEGIN
-  PROMPT 2 5 "Numerazione  "
+  PROMPT 2 6 "Numerazione  "
   FIELD NUM_FAT
   HELP "Codice numerazione"
   USE %NUM
@@ -102,7 +107,7 @@ END
 
 STRING F_DESNUM_FAT 50
 BEGIN
-  PROMPT 24 5 ""
+  PROMPT 24 6 ""
   HELP "Descrizione Numerazione"
   USE %NUM KEY 2
   INPUT S0 F_DESNUM_FAT
@@ -113,7 +118,7 @@ END
 
 STRING F_TIPODOC_FAT 4
 BEGIN
-  PROMPT 2 6 "Tipo         "
+  PROMPT 2 7 "Tipo         "
   FIELD TIPODOC_FAT
   HELP "Codice tipo documento"
   USE %TIP
@@ -128,7 +133,7 @@ END
 
 STRING F_DESTIPODOC_FAT 50
 BEGIN
-  PROMPT 24 6 ""
+  PROMPT 24 7 ""
   HELP "Descrizione tipo documento"
   USE %TIP KEY 2
   INPUT S0 F_DESTIPODOC_FAT
@@ -137,9 +142,14 @@ BEGIN
   COPY OUTPUT F_TIPODOC_FAT
 END
 
+GROUPBOX DLG_NULL 78 4
+BEGIN
+	PROMPT 1 9 "@bOrdini fornitori"
+END
+
 STRING F_CODNUM_ORF 4
 BEGIN
-  PROMPT 2 8 "Numerazione  "
+  PROMPT 2 10 "Numerazione  "
   FIELD NUM_ORF
   HELP "Codice numerazione"
   USE %NUM
@@ -155,7 +165,7 @@ END
 
 STRING F_DESNUM_ORF 50
 BEGIN
-  PROMPT 24 8 ""
+  PROMPT 24 10 ""
   HELP "Descrizione Numerazione"
   USE %NUM KEY 2
   INPUT S0 F_DESNUM_ORF
@@ -166,7 +176,7 @@ END
 
 STRING F_TIPODOC_ORF 4
 BEGIN
-  PROMPT 2 9 "Tipo         "
+  PROMPT 2 11 "Tipo         "
   FIELD TIPODOC_ORF
   HELP "Codice tipo documento"
   USE %TIP
@@ -181,7 +191,7 @@ END
 
 STRING F_DESTIPODOC_ORF 50
 BEGIN
-  PROMPT 24 9 ""
+  PROMPT 24 11 ""
   HELP "Descrizione tipo documento"
   USE %TIP KEY 2
   INPUT S0 F_DESTIPODOC_ORF
@@ -190,9 +200,14 @@ BEGIN
   COPY OUTPUT F_TIPODOC_ORF
 END
 
+GROUPBOX DLG_NULL 78 4
+BEGIN
+	PROMPT 1 13 "@bOrdini clienti"
+END
+
 STRING F_CODNUM_ORC 4
 BEGIN
-  PROMPT 2 10 "Numerazione  "
+  PROMPT 2 14 "Numerazione  "
   FIELD NUM_ORC
   HELP "Codice numerazione"
   USE %NUM
@@ -208,7 +223,7 @@ END
 
 STRING F_DESNUM_ORC 50
 BEGIN
-  PROMPT 24 10 ""
+  PROMPT 24 14 ""
   HELP "Descrizione Numerazione"
   USE %NUM KEY 2
   INPUT S0 F_DESNUM_ORC
@@ -219,7 +234,7 @@ END
 
 STRING F_TIPODOC_ORC 4
 BEGIN
-  PROMPT 2 11 "Tipo         "
+  PROMPT 2 15 "Tipo         "
   FIELD TIPODOC_ORC
   HELP "Codice tipo documento"
   USE %TIP
@@ -234,7 +249,7 @@ END
 
 STRING F_DESTIPODOC_ORC 50
 BEGIN
-  PROMPT 24 11 ""
+  PROMPT 24 15 ""
   HELP "Descrizione tipo documento"
   USE %TIP KEY 2
   INPUT S0 F_DESTIPODOC_ORC
diff --git a/lv/lv0400a.uml b/lv/lv0400a.uml
index 52ced5162..d964ab8af 100755
--- a/lv/lv0400a.uml
+++ b/lv/lv0400a.uml
@@ -25,6 +25,7 @@ BEGIN
   OUTPUT F_CODCF CODCF
   OUTPUT F_RAGSOC RAGSOC
   CHECKTYPE REQUIRED 
+  ADD RUN cg0 -1
 END
 
 STRING F_RAGSOC 50 
@@ -37,7 +38,8 @@ BEGIN
   DISPLAY "Ragione Sociale@50" RAGSOC
   DISPLAY "Codice" CODCF
   COPY OUTPUT F_CODCF
-  CHECKTYPE REQUIRED  
+  CHECKTYPE REQUIRED
+  ADD RUN cg0 -1  
 END
 
 NUMBER F_CODCONT 6
@@ -480,62 +482,9 @@ BEGIN
    GROUP 1
 END
 
-CURRENCY S_PREZZOST 15 
-BEGIN
-   PROMPT 1 5 "Prezzo in vigore       "
-   FIELD PREZZO 
-   GROUP 2  
-END
-
-CURRENCY S_PREZZORN 15 
-BEGIN
-   PROMPT 43 5 "Prezzo di rinnovo "
-   FIELD PREZRIN
-   GROUP 2
-END
-
-CURRENCY S_IMPFISART 15
-BEGIN
-   PROMPT 1 6 "Importo fisso          "
-   FIELD IMPFISART
-END
-
-NUMBER S_SCONTO 6 2
-BEGIN
-   PROMPT 43 6 "Sconto %          "
-   FIELD SCONTPERC
-END
-
-NUMBER S_CONG 9 
-BEGIN
-   PROMPT 1 7 "Conguaglio             "
-   FIELD QTACONG
-END
-
-CURRENCY S_VALCONV 15 
-BEGIN
-   PROMPT 43 7 "Val. convenzionale"
-   FLAGS "U"
-   FIELD VALCONV
-   GROUP 3
-END
-
-NUMBER S_FORFPERCL 6 2
-BEGIN
-   PROMPT 1 8 "% Forfait cliente      "
-   FIELD FORFPERCL
-   GROUP 3
-END
-
-NUMBER S_MINCIC 4 2
-BEGIN
-   PROMPT 43 8 "Minimo cilcaggio  "
-   FIELD MINCIC
-END
-
 STRING S_UM 2
 BEGIN
-   PROMPT 1 9 "Unit� di misura        "
+   PROMPT 1 5 "Unit� di misura        "
    USE LF_UMART KEY 2
    JOIN UMS INTO CODTAB=UM
    INPUT CODART S_CODART SELECT
@@ -547,9 +496,111 @@ BEGIN
    CHECKTYPE REQUIRED
 END
 
+NUMBER S_CONG 9 
+BEGIN
+   PROMPT 43 5 "Conguaglio             "
+   FIELD QTACONG
+END
+
+CURRENCY S_PREZZOST 15 
+BEGIN
+   PROMPT 1 6 "Prezzo in vigore       "
+   FIELD PREZZO 
+   GROUP 2  
+END
+
+CURRENCY S_PREZZORN 15 
+BEGIN
+   PROMPT 43 6 "Prezzo di rinnovo "
+   FIELD PREZRIN
+   GROUP 2
+END
+
+NUMBER S_SCONTO 6 2
+BEGIN
+   PROMPT 1 7 "Sconto %          "
+   FIELD SCONTPERC
+END
+
+NUMBER S_DOTIN 9 
+BEGIN
+   PROMPT 1 8 "Dot. iniziale          "
+   FIELD DOTIN
+END
+
+NUMBER S_DOTOD 9 
+BEGIN
+  PROMPT 43 8 "Dotaz. odierna "
+  FLAGS "D"
+END
+
+NUMBER S_CONSMESE 9
+BEGIN
+   PROMPT 1 9 "Consegnato mese"
+   FLAGS "D"
+END
+
+NUMBER S_CONSANNO 9
+BEGIN
+   PROMPT 43 9 "Consegn. anno"
+   FLAGS "D"
+END
+
+NUMBER S_DOTTMP 9 
+BEGIN
+   PROMPT 1 10 "Dot. temporanea   "
+   FIELD DOTTMP
+END
+
+CURRENCY S_PRZDTTMP 15 
+BEGIN
+   PROMPT 43 10 "Prezzo dot. temp. "
+   FLAGS "U"
+   FIELD PRZDTTMP
+END
+
+DATE S_INDTTMP
+BEGIN
+   PROMPT 1 11 "Inizio dot. temporanea "
+   FIELD INDTTMP
+END
+
+DATE S_FIDTTMP
+BEGIN
+   PROMPT 43 11 "Fine dot. temp    "
+   FIELD FIDTTMP
+END
+
+CURRENCY S_IMPFISART 15
+BEGIN
+   PROMPT 1 12 "Importo fisso          "
+   FIELD IMPFISART
+END
+
+CURRENCY S_VALCONV 15 
+BEGIN
+   PROMPT 43 12 "Val. convenzionale"
+   FLAGS "U"
+   FIELD VALCONV
+   GROUP 3
+END
+
+NUMBER S_FORFPERCL 6 2
+BEGIN
+   PROMPT 1 13 "% Forfait cliente      "
+   FIELD FORFPERCL
+   GROUP 3
+END
+
+NUMBER S_MINCIC 4 2
+BEGIN
+   PROMPT 43 13 "Minimo cilcaggio  "
+   FIELD MINCIC
+END
+
 STRING S_CAUSMAG 4
 BEGIN
-   PROMPT 43 9 "Causale di default"
+   PROMPT 1 14 "Causale di default"
    USE CAU
    INPUT CODTAB S_CAUSMAG
    DISPLAY "Codice" CODTAB
@@ -561,45 +612,14 @@ END
 
 CURRENCY S_PREZDAN 15
 BEGIN
-   PROMPT 1 10 "Prezzo danneggiati     "
+   PROMPT 43 14 "Prezzo danneggiati     "
    FLAGS "U"
    FIELD PREZDAN
 END
 
-CURRENCY S_PRZDTTMP 15 
+LISTBOX S_ARTBLOC 1 28
 BEGIN
-   PROMPT 43 10 "Prezzo dot. temp. "
-   FLAGS "U"
-   FIELD PRZDTTMP
-END
-
-NUMBER S_DOTIN 9 
-BEGIN
-   PROMPT 1 11 "Dot. iniziale          "
-   FIELD DOTIN
-END
-
-NUMBER S_DOTTMP 9 
-BEGIN
-   PROMPT 43 11 "Dot. temporanea   "
-   FIELD DOTTMP
-END
-
-DATE S_INDTTMP
-BEGIN
-   PROMPT 1 12 "Inizio dot. temporanea "
-   FIELD INDTTMP
-END
-
-DATE S_FIDTTMP
-BEGIN
-   PROMPT 43 12 "Fine dot. temp    "
-   FIELD FIDTTMP
-END
-
-LISTBOX S_ARTBLOC 1 34
-BEGIN
-   PROMPT 1 13 "Articolo bloccato      "
+   PROMPT 1 16 "Articolo bloccato "
    ITEM  "0|Nessuna"
    ITEM  "1|Articolo in sostituzione"
    ITEM  "2|Cliente in chiusura"
@@ -607,49 +627,43 @@ BEGIN
    FIELD ARTBLOC
 END
 
+LISTBOX S_TIPONOL 1 10
+BEGIN
+   PROMPT 55 16 "Tipo Noleggio "
+   FIELD TIPONOL
+   FLAGS "D"
+END
+
 LISTBOX S_CALCCONS 1 34
 BEGIN
-   PROMPT 1 14 "Calcolo del consegnato "
+   PROMPT 1 17 "Calcolo del consegnato "
    ITEM  "0|Conguaglio alla confezione"
    ITEM  "1|Uguale al ritirato"
    FIELD CALCCONS
 END
 
-LISTBOX S_TIPONOL 1 34
-BEGIN
-   PROMPT 1 15 "Tipo Noleggio          "
-   FIELD TIPONOL
-   FLAGS "D"
-END
-
-BOOLEAN S_RITAUDTTMP
-BEGIN
-   PROMPT 1 16 "Ritiro automatico dotazione temporanea"
-   FIELD RITAUDTTMP
-END
-
 BOOLEAN  S_FATTKG
 BEGIN
-   PROMPT 1 17 "Fatturazione a Kg."
+   PROMPT 1 18 "Fatturazione a Kg."
    FIELD FATTKG
 END
 
 BOOLEAN  S_ARROT
 BEGIN
-   PROMPT 1 18 "Arrotondamento"
+   PROMPT 43 18 "Arrotondamento"
    FIELD ARROT
 END
 
+BOOLEAN S_RITAUDTTMP
+BEGIN
+   PROMPT 1 19 "Ritiro automatico dotazione temporanea"
+   FIELD RITAUDTTMP
+END
+
 ENDPAGE
 
 PAGE "" -1 -1 80 20
 
-NUMBER S_DOTOD 9 
-BEGIN
-  PROMPT 2 5 "Dotaz. odierna "
-  FLAGS "D"
-END
-
 STRING S_COLORE 20 10
 BEGIN
   PROMPT 30 5 "Colore       "
@@ -670,7 +684,7 @@ END
 
 NUMBER S_PPCONF 9
 BEGIN 
-  PROMPT 2 6 "Pz. per Pacco  "
+  PROMPT 2 6 "Pz. per Pacco "
   FLAGS "D"
 END 
 
@@ -740,18 +754,6 @@ BEGIN
   FLAGS "D"
 END 
 
-NUMBER S_CONSMESE 9
-BEGIN
-   PROMPT 2 10 "Consegnato mese"
-   FLAGS "D"
-END
-
-NUMBER S_CONSANNO 9
-BEGIN
-   PROMPT 30 10 "Consegn. anno"
-   FLAGS "D"
-END
-
 ENDPAGE
 
 ENDMASK