From 349683d8ea4cd7f1b08faeb15bef6dd23ee610a5 Mon Sep 17 00:00:00 2001
From: alex <alex@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Tue, 26 Mar 1996 09:48:44 +0000
Subject: [PATCH] Corretti errori per vendite e conflitto

git-svn-id: svn://10.65.10.50/trunk@2697 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 cg/cg0200a.uml | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/cg/cg0200a.uml b/cg/cg0200a.uml
index bc1761b6b..a8fd8c36d 100755
--- a/cg/cg0200a.uml
+++ b/cg/cg0200a.uml
@@ -639,13 +639,8 @@ END
 
 STRING F_CODVAL 3
 BEGIN
-<<<<<<< cg0200a.uml
-PROMPT 2 6 "Valuta      "  
-FLAGS "UZ"
-=======
 PROMPT 2 6 "Valuta      "
 FLAGS "UZ"
->>>>>>> 1.23
 FIELD CODVAL
 USE %VAL
 INPUT CODTAB F_CODVAL
@@ -1510,6 +1505,7 @@ USE LF_PCON SELECT (CONTO!="")&&(SOTTOCONTO="")&&(TMCF=#F_TIPOCF)
   BEGIN
   PROMPT 54 16 "Categoria vendita  "
   FIELD LF_CFVEN->CATVEN
+  FLAGS "U"
   GROUP 7
   USE %CVE
   INPUT CODTAB F_CATVEN
@@ -1620,20 +1616,29 @@ USE LF_PCON SELECT (CONTO!="")&&(SOTTOCONTO="")&&(TMCF=#F_TIPOCF)
   STRING F_CODMAG 3
   BEGIN
   PROMPT 48 5 "Codice magazzino        "
-  FIELD LF_CFVEN->CODMAG  
-  HELP "Codice del magazzino movimentato"
-  END
+  FIELD LF_CFVEN->CODMAG
+  USE MAG SELECT CODTAB[4,5]==""
+  INPUT CODTAB F_CODMAG
+  DISPLAY "Codice" CODTAB[1,3]
+  DISPLAY "Denominazione@50" S0
+  OUTPUT F_CODMAG CODTAB[1,3]
+  WARNING "Codice del magazzino errato"
+  CHECKTYPE NORMAL
+END
 
   STRING F_CODLIST 5
   BEGIN
   PROMPT 48 6 "Codice listino        "
   FIELD LF_CFVEN->CODLIST
-  USE %LIS
-  INPUT CODTAB F_CODLIST
-  DISPLAY "Codice listino " CODTAB
-  DISPLAY "Descrizione@50" S0
-  OUTPUT F_CODLIST CODTAB
-  HELP "Codice listino utilizzato"
+  USE LF_CONDV
+  INPUT TIPO "L"
+  INPUT CATVEN F_CATVEN
+  INPUT COD F_CODLIST
+  DISPLAY "Codice cat.vendita " CATVEN
+  DISPLAY "Codice listino " COD
+  DISPLAY "Descrizione@50" DESC
+  OUTPUT F_CODLIST COD
+  WARNING "Codice listino errato"
   CHECKTYPE NORMAL
   END