diff --git a/lv/lv0500a.uml b/lv/lv0500a.uml
index 568fa0319..54afaa0a4 100755
--- a/lv/lv0500a.uml
+++ b/lv/lv0500a.uml
@@ -16,7 +16,35 @@ BEGIN
   PROMPT 2 2 "Cliente   "
   FLAGS "UG"
   FIELD CODCF
-  USE LF_LVCONDV
+  USE LF_CLIFO 
+  INPUT TIPOCF "C"
+  INPUT CODCF F_CODCF
+  DISPLAY "Codice" CODCF
+  DISPLAY "Ragione Sociale@50" RAGSOC
+  OUTPUT F_CODCF CODCF
+  OUTPUT F_RAGSOCCLI RAGSOC
+  CHECKTYPE REQUIRED
+  KEY 1
+END
+
+STRING F_RAGSOCCLI 50
+BEGIN
+  PROMPT 22 2 ""
+  USE LF_CLIFO KEY 2
+  INPUT TIPOCF "C"
+  INPUT RAGSOC F_RAGSOCCLI
+  DISPLAY "Ragione Sociale@50" RAGSOC
+  DISPLAY "Codice" CODCF
+  COPY OUTPUT F_CODCF
+  CHECKTYPE REQUIRED
+END
+
+NUMBER F_CODCONT 6
+BEGIN
+  PROMPT 2 3 "Contratto "
+  FLAGS "U"
+  FIELD CODCONT
+  USE LF_LVCONDV SELECT BETWEEN(CODCF,#F_CODCF,#F_CODCF)
   JOIN LF_CLIFO INTO TIPOCF="C" CODCF=CODCF
   INPUT CODCF F_CODCF  
   INPUT CODCONT F_CODCONT  
@@ -34,22 +62,6 @@ BEGIN
   KEY 1
 END
 
-STRING F_RAGSOCCLI 50
-BEGIN
-  PROMPT 22 2 ""
-  FLAGS "D"
-END
-
-NUMBER F_CODCONT 6
-BEGIN
-  PROMPT 2 3 "Contratto "
-  FLAGS "U"
-  FIELD CODCONT
-  COPY ALL F_CODCF
-  CHECKTYPE FORCED
-  KEY 1
-END
-
 DATE F_VALIDA
 BEGIN
   PROMPT 22 3 "Valido dal "