From b2e312c1569db273594c96a899bab9487edd5743 Mon Sep 17 00:00:00 2001
From: alex <alex@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Tue, 8 Aug 1995 10:16:36 +0000
Subject: [PATCH] Corretta tabella sco in scc

git-svn-id: svn://10.65.10.50/trunk@1688 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 cg/cg0200.h    |  5 ++---
 cg/cg0200a.uml | 32 ++++++++++++--------------------
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/cg/cg0200.h b/cg/cg0200.h
index c76238356..60d536f1e 100755
--- a/cg/cg0200.h
+++ b/cg/cg0200.h
@@ -103,8 +103,8 @@
 #define F_GESTCONTR                   195
 #define F_CATVEN                      196
 #define F_CODLIST                     197
-#define F_CODSCINC                    198
-#define F_SCONTOCL                    199
+#define F_CODSCC                      198
+#define F_SCONTO                      199
 #define F_CODMAG                      200
 #define F_CODSP1                      201
 #define F_CODSP2                      202
@@ -114,7 +114,6 @@
 #define F_MAXSOLL                     206
 #define F_DATAESC                     207
 #define F_DATASOLL                    208
-#define F_SCONTOR                     209
 #define F_TITOLO                      210
 #define F_RAGGOR                      211
 #define F_MINORD                      212
diff --git a/cg/cg0200a.uml b/cg/cg0200a.uml
index e0d38a66f..48dd8ace4 100755
--- a/cg/cg0200a.uml
+++ b/cg/cg0200a.uml
@@ -1629,35 +1629,27 @@ USE LF_PCON SELECT (CONTO!="")&&(SOTTOCONTO="")&&(TMCF=#F_TIPOCF)
   CHECKTYPE NORMAL
   END
 
-  STRING F_CODSCINC 3
+  STRING F_CODSCC 2
   BEGIN
-  PROMPT 2 8 "Sconto incondizionato   "
-  FIELD LF_CFVEN->CODSCINC
-  USE %SCO
-  INPUT CODTAB F_CODSCINC
+  PROMPT 2 8 "Codice sconto cliente   "
+  FIELD LF_CFVEN->CODSCC
+  USE %SCC
+  INPUT CODTAB F_CODSCC
   DISPLAY "Codice sconto" CODTAB
   DISPLAY "Descrizione@50" S0
   DISPLAY "Percentuale" R0
-  OUTPUT F_CODSCINC CODTAB
-  HELP "Codice dello sconto incondizionato"
+  OUTPUT F_CODSCC CODTAB
+  HELP "Codice dello sconto cliente"
+  GROUP 7
   CHECKTYPE NORMAL
   END
 
-  NUMBER F_SCONTOCL 5 2
+  STRING F_SCONTO 25
   BEGIN
-  PROMPT 48 8 "Sconto cliente        "
-  FIELD LF_CFVEN->SCONTOCL
-  FLAGS "R"
-  PICTURE ".2"
-  HELP "Percentuale sconto applicato"
-  END
-
-  STRING F_SCONTOR 15
-  BEGIN
-  PROMPT 2 9 "Sconto di riga          "
-  FIELD LF_CFVEN->SCONTOR
+  PROMPT 2 9 "Sconto                  "
+  FIELD LF_CFVEN->SCONTO
   GROUP 7
-  HELP "Percentuale sconto di riga applicato nelle forme: semplice, es. 10 (per 10%) composto, es. 10+5 (per 10%+5%) oppure  10+5+2 (per 10%+5%+2%)"
+  HELP "Percentuale sconto di riga applicato nelle forme: semplice, es. 10 (per 10%) composto, es. 10+5 (per 10%+5%) oppure  10+5-2 (per 10%+5%-2%)"
   END
 
   STRING F_PROFSOLL 5