From 86c632ade01013fc97fc61c77ffbc63da87c14b9 Mon Sep 17 00:00:00 2001
From: lvietri <lvietri@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Tue, 2 Dec 2008 16:23:30 +0000
Subject: [PATCH] Patch level         : Files correlati     : Ricompilazione
 Demo : [ ] Commento            :

git-svn-id: svn://10.65.10.50/trunk@17773 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 lv/lv0400.h    |   7 +
 lv/lv0400a.uml | 509 ++++++++++++++++++++++++++++---------------------
 lv/verig21.uml |   4 +-
 3 files changed, 305 insertions(+), 215 deletions(-)

diff --git a/lv/lv0400.h b/lv/lv0400.h
index 576d7a891..6fc42144c 100755
--- a/lv/lv0400.h
+++ b/lv/lv0400.h
@@ -86,5 +86,12 @@
 #define S_ARTLAVCONT   143
 #define S_MANGDEST     144
 
+#define S_CODCF        301
+#define S_RAGSOC       302
+#define S_CODCONT      303 
+#define T_CODCF        401
+#define T_RAGSOC       402
+#define T_CODCONT      403 
+
 
 
diff --git a/lv/lv0400a.uml b/lv/lv0400a.uml
index 7bd3bbf6e..2469fcdf5 100755
--- a/lv/lv0400a.uml
+++ b/lv/lv0400a.uml
@@ -8,7 +8,7 @@ PAGE "Contratto" 0 2 0 0
 
 GROUPBOX DLG_NULL 78 6
 BEGIN
-	PROMPT 1 0 "@bContratti"
+	PROMPT 1 0 "@b Contratti"
 END
 
 NUMBER F_CODCF 6
@@ -25,7 +25,7 @@ BEGIN
   OUTPUT F_CODCF CODCF
   OUTPUT F_RAGSOC RAGSOC
   CHECKTYPE REQUIRED 
-  ADD RUN cg0 -1
+  ADD RUN cg0 -1 
 END
 
 STRING F_RAGSOC 50 
@@ -160,7 +160,7 @@ BEGIN
   ITEM "Linea dest. 2"
   ITEM "Lavatrice"
   ITEM "Art.lavacont"
-  ITEM "Mangano Dest."    
+  ITEM "Mangano Dest."   
 END
 
 ENDPAGE
@@ -169,7 +169,7 @@ PAGE "Opzioni" 0 2 0 0
 
 GROUPBOX DLG_NULL 79 11
 BEGIN
-	PROMPT 1 1 "@bFatturazione"
+	PROMPT 1 1 "@b Fatturazione"
 END
 
 DATE F_INPERFAT
@@ -222,7 +222,7 @@ END
 
 RADIOBUTTON F_PERFAT 1 70
 BEGIN
-  PROMPT 5 8 "@bPeriodicità di fatturazione "
+  PROMPT 5 8 "@b Periodicità di fatturazione "
   ITEM "0|Giornaliero" 
   ITEM "1|Settimanale" 
   ITEM "2|Quindicinale" 
@@ -233,7 +233,7 @@ END
 
 GROUPBOX DLG_NULL 38 10
 BEGIN
-	PROMPT 1 12 "@bTipo canone"
+	PROMPT 1 12 "@b Tipo canone"
 END
 
 RADIOBUTTON F_TIPOCAN 1 38
@@ -250,7 +250,7 @@ END
 
 RADIOBUTTON F_TIPOLIS 1 25
 BEGIN
-   PROMPT 40 12 "@bTipo Listino"
+   PROMPT 40 12 "@b Tipo Listino"
    ITEM "0|Prezzo nel contratto" 
    ITEM "1|Listino in anag.Articoli" 
    FIELD TIPOLIS
@@ -258,7 +258,7 @@ END
 
 RADIOBUTTON F_TIPOIMB 1 14
 BEGIN
-   PROMPT 66 12 "@bTipo imballo"
+   PROMPT 66 12 "@b Tipo imballo"
    ITEM "0|Sacco" 
    ITEM "1|Carrello" 
    FIELD TIPOIMB
@@ -266,7 +266,7 @@ END
 
 RADIOBUTTON F_CONTSPOR 1 40
 BEGIN
-   PROMPT 40 16 "@bConta dello sporco"
+   PROMPT 40 16 "@b Conta dello sporco"
    ITEM "0|Nessuno" 
    ITEM "1|Sporco" 
    ITEM "2|Solo pulito" 
@@ -427,16 +427,43 @@ END
 
 ENDPAGE
 
+
 PAGE "" -1 -1 80 20
 
+GROUPBOX DLG_NULL 78 4
+BEGIN
+	PROMPT 1 0 "@b Contratto"
+END
+
+NUMBER S_CODCF 6
+BEGIN
+  PROMPT 2 1 "Cliente      " 
+  FLAGS "DG"
+  NUM_CALC #-F_CODCF
+END
+
+STRING S_RAGSOC 50 
+BEGIN
+  PROMPT 25 1 ""
+  FLAGS "DG"
+  STR_CALC #-F_RAGSOC
+END
+
+NUMBER S_CODCONT 6
+BEGIN
+  PROMPT 2 2 "Contratto N. "
+  FLAGS "DG"
+  NUM_CALC #-F_CODCONT
+END
+
 GROUPBOX DLG_NULL 78 3
 BEGIN
-	PROMPT 1 0 "@bArticolo"
+	PROMPT 1 4 "@b Articolo"
 END
 
 STRING S_CODART 20
 BEGIN
-  PROMPT 2 1 ""
+  PROMPT 2 5 ""
   FLAGS "U"
   USE LF_ANAMAG
   INPUT CODART S_CODART
@@ -452,7 +479,7 @@ END
 
 STRING S_DESCR 50
 BEGIN
-	PROMPT 25 1 ""
+	PROMPT 25 5 ""
   USE LF_ANAMAG KEY 2
   INPUT DESCR S_DESCR
   DISPLAY "Descrizone@50" DESCR
@@ -461,9 +488,15 @@ BEGIN
   CHECKTYPE REQUIRED  
 END
 
+
+GROUPBOX DLG_NULL 78 4
+BEGIN
+	PROMPT 1 7 "@b Forfait"
+END
+
 LISTBOX S_TIPOFORF 1 25
 BEGIN
-   PROMPT 1 3 "Tipo Forfait "
+   PROMPT 2 8 "Tipo Forfait "
    ITEM  "0|Nessuno"
    MESSAGE DISABLE,1@|DISABLE, S_IMPFISART|DISABLE,3@|DISABLE,S_MINCIC|ENABLE,2@
    ITEM  "1|A valore fisso"
@@ -481,25 +514,144 @@ END
 
 LISTBOX S_NOLCIC 1 20
 BEGIN
-   PROMPT 46 3 "In base a "
+   PROMPT 46 8 "In base a "
    ITEM "N|Nessuno"
    ITEM "I|Dot. iniziale" 
    ITEM "O|Dot. odierna"
    GROUP 1
 END
 
+NUMBER S_FORFPERCL 6 2
+BEGIN
+   PROMPT 2 9 "% Cliente    "
+   FIELD FORFPERCL
+   GROUP 3
+END
+
 LISTBOX S_VCARTCLI 1 20
 BEGIN
-   PROMPT 46 4 "Per       "
+   PROMPT 46 9 "Per       "
    ITEM "N|Nessuno"
    ITEM "C|Cliente"
    ITEM "A|Articolo"
    GROUP 1
 END
 
+GROUPBOX DLG_NULL 78 5
+BEGIN
+	PROMPT 1 11 "@b Prezzo"
+END
+
+CURRENCY S_PREZZOST 15 
+BEGIN
+   PROMPT 2 12 "In vigore  "
+   FIELD PREZZO 
+   GROUP 2  
+END
+
+CURRENCY S_PREZZORN 15 
+BEGIN
+   PROMPT 30 12 "Di rinnovo "
+   FIELD PREZRIN
+   GROUP 2
+END
+
+NUMBER S_SCONTO 6 2
+BEGIN
+   PROMPT 60 12 "Sconto %"
+   FIELD SCONTPERC
+END
+
+CURRENCY S_PREZDAN 15
+BEGIN
+   PROMPT 2 13 "Danneggiati"
+   FLAGS "U"
+   FIELD PREZDAN
+END
+
+BOOLEAN  S_FATTKG
+BEGIN
+   PROMPT 30 13 "Fatturazione a Kg."
+   FIELD FATTKG
+END
+
+BOOLEAN  S_ARROT
+BEGIN
+   PROMPT 60 13 "Arrotondamento"
+   FIELD ARROT
+END
+
+CURRENCY S_IMPFISART 15
+BEGIN
+   PROMPT 2 14 "Impor.fisso"
+   FIELD IMPFISART
+END
+
+CURRENCY S_VALCONV 15 
+BEGIN
+   PROMPT 30 14 "Val.Conven."
+   FLAGS "U"
+   FIELD VALCONV
+   GROUP 3
+END
+
+GROUPBOX DLG_NULL 78 3
+BEGIN
+	PROMPT 1 16 "@b Dotazione"
+END
+
+NUMBER S_DOTIN 9 
+BEGIN
+   PROMPT 2 17 "Iniziale"
+   FIELD DOTIN
+END
+
+NUMBER S_DOTOD 9 
+BEGIN
+  PROMPT 30 17 "Odierna"
+  FLAGS "D"
+END
+
+NUMBER S_DOTTMP 9 
+BEGIN
+   PROMPT 56 17 "Temporanea"
+   FIELD DOTTMP
+END
+
+GROUPBOX DLG_NULL 78 3
+BEGIN
+	PROMPT 1 19 "@b Dotazione Temporanea"
+END
+
+CURRENCY S_PRZDTTMP 15 
+BEGIN
+   PROMPT 2 20 "Prezzo"
+   FLAGS "U"
+   FIELD PRZDTTMP
+END
+
+DATE S_INDTTMP
+BEGIN
+   PROMPT 25 20 "Inizio"
+   FIELD INDTTMP
+END
+
+DATE S_FIDTTMP
+BEGIN 
+   PROMPT 43 20 "Fine"
+   FIELD FIDTTMP
+END
+
+BOOLEAN S_RITAUDTTMP
+BEGIN
+   PROMPT 60 20 "Ritiro automatico"
+   FIELD RITAUDTTMP
+END
+
+
 STRING S_UM 2
 BEGIN
-   PROMPT 1 5 "Unità di misura        "
+   PROMPT 2 22 "Unità di misura"
    USE LF_UMART KEY 2
    JOIN UMS INTO CODTAB=UM
    INPUT CODART S_CODART SELECT
@@ -513,109 +665,13 @@ END
 
 NUMBER S_CONG 9 
 BEGIN
-   PROMPT 43 5 "Conguaglio            "
+   PROMPT 25 22 "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_CAUSLAV 3
 BEGIN
-   PROMPT 1 14 "Causale di default"
+   PROMPT 50 22 "Causale di default"
    USE &CAU
    INPUT CODTAB S_CAUSLAV
    DISPLAY "Codice" CODTAB
@@ -625,16 +681,64 @@ BEGIN
    CHECKTYPE NORMAL
 END
 
-CURRENCY S_PREZDAN 15
+ENDPAGE
+
+PAGE "" -1 -1 80 20
+
+GROUPBOX DLG_NULL 78 4
 BEGIN
-   PROMPT 43 14 "Prezzo danneggiati     "
-   FLAGS "U"
-   FIELD PREZDAN
+	PROMPT 1 0 "@b Contratto"
+END
+
+NUMBER T_CODCF 6
+BEGIN
+  PROMPT 2 1 "Cliente      " 
+  FLAGS "DG"
+  NUM_CALC #-F_CODCF
+END
+
+STRING T_RAGSOC 50 
+BEGIN
+  PROMPT 25 1 ""
+  FLAGS "DG"
+  STR_CALC #-F_RAGSOC
+END
+
+NUMBER T_CODCONT 6
+BEGIN
+  PROMPT 2 2 "Contratto N. "
+  FLAGS "DG"
+  NUM_CALC #-F_CODCONT
+END
+
+GROUPBOX DLG_NULL 78 3
+BEGIN
+	PROMPT 1 4 "@b Consegnato"
+END
+
+LISTBOX S_CALCCONS 1 34
+BEGIN
+   PROMPT 2 5 "Calcolo"
+   ITEM  "0|Conguaglio alla confezione"
+   ITEM  "1|Uguale al ritirato"
+   FIELD CALCCONS
+END
+
+NUMBER S_CONSMESE 9
+BEGIN
+   PROMPT 47 5 "Mese"
+   FLAGS "D"
+END
+
+NUMBER S_CONSANNO 9
+BEGIN
+   PROMPT 62 5 "Anno"
+   FLAGS "D"
 END
 
 LISTBOX S_ARTBLOC 1 28
 BEGIN
-   PROMPT 1 16 "Articolo bloccato "
+   PROMPT 1 7 "Articolo bloccato"
    ITEM  "0|Nessuna"
    ITEM  "1|Articolo in sostituzione"
    ITEM  "2|Cliente in chiusura"
@@ -644,50 +748,99 @@ END
 
 LISTBOX S_TIPONOL 1 10
 BEGIN
-   PROMPT 55 16 "Tipo Noleggio "
+   PROMPT 50 7 "Tipo Noleggio "
    FIELD TIPONOL
    FLAGS "D"
 END
 
-LISTBOX S_CALCCONS 1 34
+
+NUMBER S_PPCONF 9
+BEGIN 
+  PROMPT 2 9 "Pz. per Pacco  "
+  FLAGS "D"
+END 
+
+NUMBER S_PPCOLLO 9
+BEGIN 
+  PROMPT 30 9 "Per Sacco    "
+  FLAGS "D"
+END 
+
+NUMBER S_PPPALLET 9
+BEGIN 
+  PROMPT 55 9 "Per Carrello "
+  FLAGS "D"
+END 
+
+STRING S_MANGDEST 3
 BEGIN
-   PROMPT 1 17 "Calcolo del consegnato "
-   ITEM  "0|Conguaglio alla confezione"
-   ITEM  "1|Uguale al ritirato"
-   FIELD CALCCONS
+  PROMPT 2 10 "Mangano Dest.  "
+  FLAGS "D"
+END 
+
+STRING S_ARTLAVCONT 4
+BEGIN
+  PROMPT 30 10 "Art.Lav.cont."
+  FLAGS "D"
+END 
+
+STRING S_LAVATRICE 4
+BEGIN
+  PROMPT 55 10 "Lavatrice    "
+  FLAGS "D"
+END 
+
+STRING S_CODLAV1 3
+BEGIN
+  PROMPT 2 11 "Cod. Lavag. 1  "
+  FLAGS "D"
+END 
+
+STRING S_CODLAV2 3
+BEGIN
+  PROMPT 30 11 "Cod. Lavag. 2"
+  FLAGS "D"
 END
 
-BOOLEAN  S_FATTKG
+STRING S_TIPOPARTE 1
 BEGIN
-   PROMPT 1 18 "Fatturazione a Kg."
-   FIELD FATTKG
-END
+  PROMPT 55 11 "Tipo Parte   "
+  FLAGS "D"
+END 
 
-BOOLEAN  S_ARROT
+STRING S_LINDEST1 3
 BEGIN
-   PROMPT 43 18 "Arrotondamento"
-   FIELD ARROT
-END
+  PROMPT 2 12 "Linea dest. 1  "
+  FLAGS "D"
+END 
 
-BOOLEAN S_RITAUDTTMP
+STRING S_LINDEST2 3
 BEGIN
-   PROMPT 1 19 "Ritiro automatico dotazione temporanea"
-   FIELD RITAUDTTMP
+  PROMPT 30 12 "Linea dest. 2"
+  FLAGS "D"
+END 
+
+STRING S_LIVELLO 1
+BEGIN
+  PROMPT 55 12 "Livello      "
+  FLAGS "D"
+END 
+
+NUMBER S_MINCIC 4 2
+BEGIN
+   PROMPT 2 13 "Min. cilcaggio "
+   FIELD MINCIC
 END
 
-ENDPAGE
-
-PAGE "" -1 -1 80 20
-
 STRING S_COLORE 20 10
 BEGIN
-  PROMPT 30 5 "Colore       "
+  PROMPT 30 13 "Colore       "
   FLAGS "D"
 END 
 
 STRING S_GRMERC 3
 BEGIN
-  PROMPT 55 5 "Tipologia    "
+  PROMPT 55 13 "Tipologia    "
   FLAG "UD"
   USE GMC KEY 1 SELECT CODTAB[4,5]==""
   INPUT CODTAB S_GRMERC
@@ -697,78 +850,6 @@ BEGIN
   CHECKTYPE NORMAL
 END
 
-NUMBER S_PPCONF 9
-BEGIN 
-  PROMPT 2 6 "Pz. per Pacco "
-  FLAGS "D"
-END 
-
-NUMBER S_PPCOLLO 9
-BEGIN 
-  PROMPT 30 6 "Per Sacco    "
-  FLAGS "D"
-END 
-
-NUMBER S_PPPALLET 9
-BEGIN 
-  PROMPT 55 6 "Per Carrello "
-  FLAGS "D"
-END 
-
-STRING S_MANGDEST 3
-BEGIN
-  PROMPT 2 7 "Mangano Dest.  "
-  FLAGS "D"
-END 
-
-STRING S_ARTLAVCONT 4
-BEGIN
-  PROMPT 30 7 "Art.Lav.cont."
-  FLAGS "D"
-END 
-
-STRING S_LAVATRICE 4
-BEGIN
-  PROMPT 55 7 "Lavatrice    "
-  FLAGS "D"
-END 
-
-STRING S_CODLAV1 3
-BEGIN
-  PROMPT 2 8 "Cod. Lavag. 1  "
-  FLAGS "D"
-END 
-
-STRING S_CODLAV2 3
-BEGIN
-  PROMPT 30 8 "Cod. Lavag. 2"
-  FLAGS "D"
-END
-
-STRING S_TIPOPARTE 1
-BEGIN
-  PROMPT 55 8 "Tipo Parte   "
-  FLAGS "D"
-END 
-
-STRING S_LINDEST1 3
-BEGIN
-  PROMPT 2 9 "Linea dest. 1  "
-  FLAGS "D"
-END 
-
-STRING S_LINDEST2 3
-BEGIN
-  PROMPT 30 9 "Linea dest. 2"
-  FLAGS "D"
-END 
-
-STRING S_LIVELLO 1
-BEGIN
-  PROMPT 55 9 "Livello      "
-  FLAGS "D"
-END 
-
 ENDPAGE
 
 ENDMASK
diff --git a/lv/verig21.uml b/lv/verig21.uml
index e4f0e2db6..8b5eeba73 100755
--- a/lv/verig21.uml
+++ b/lv/verig21.uml
@@ -13,7 +13,6 @@ DEFINE_FIELD(DESMAG)
 DEFINE_FIELD(CODDEP)
 DEFINE_FIELD(DESDEP)
 DEFINE_FIELD(CODART)
-// F_OUT(CODART, FR_CODAGG1, USER1)
 DEFINE_FIELD(DESCRART)
 DEFINE_FIELD(UMQTA)
 DEFINE_FIELD(QTA)
@@ -39,6 +38,9 @@ DEFINE_FIELD(DESMAGC)
 DEFINE_FIELD(CODDEPC)
 DEFINE_FIELD(DESDEPC)
 
+DEFINE_FIELD(CODCF)
+F_POS(CODCF, 1 ,1 ,"Cliente      ")
+
 
 #include "verig.uml"