From c067cee0541ff6d26bd306a8b6942fb2d82f2c96 Mon Sep 17 00:00:00 2001
From: alex <alex@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Fri, 5 Dec 1997 11:55:02 +0000
Subject: [PATCH] Aggiunto campo raggruppamento effetti

git-svn-id: svn://10.65.10.50/trunk@5699 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 cg/cg0200.h    | 5 +++--
 cg/cg0200a.uml | 9 ++++++++-
 cg/f17.trr     | 3 ++-
 ve/velib06.cpp | 1 +
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/cg/cg0200.h b/cg/cg0200.h
index 36a3b3db2..0fd7cfabb 100755
--- a/cg/cg0200.h
+++ b/cg/cg0200.h
@@ -39,13 +39,13 @@
 #define F_DENCOMNASC 135
 #define F_CODSTAT    130
 #define F_CODPAG     131   
-#define F_DESPAG     231
+#define F_DESPAG     331
 #define F_RAGSOC1    132
 #define F_CODABI     133
 #define F_CODBAN     134
 #define F_DESBAN     140  
 #define F_CODVAL     136
-#define F_DESVAL     236
+#define F_DESVAL     336
 #define F_FIDO       139
 #define F_LOCALITACF 144
 #define F_CODAG      145
@@ -131,6 +131,7 @@
 #define F_TEMP                        223
 #define F_DESTACF                     224
 #define F_CODDEP                      230
+#define F_RAGGEFF                     232
 
 #define DLG_RIC                       300
 #define DLG_CST                       301
diff --git a/cg/cg0200a.uml b/cg/cg0200a.uml
index be9946e3d..da6853ccd 100755
--- a/cg/cg0200a.uml
+++ b/cg/cg0200a.uml
@@ -1220,7 +1220,7 @@ BEGIN
   CHECKTYPE NORMAL
 END
 
-  BOOLEAN F_RAGGDOC
+BOOLEAN F_RAGGDOC
 BEGIN
   PROMPT 23 8 "Raggruppamento documenti"
   FIELD LF_CFVEN->RAGGDOC
@@ -1427,6 +1427,13 @@ BEGIN
   HELP "Importo minimo effetti"
 END
 
+BOOLEAN F_RAGGEFF
+BEGIN
+  PROMPT 45 7 "Raggruppamento effetti"
+  FIELD LF_CFVEN->RAGGEFF
+  GROUP 7
+END
+
 GROUPBOX DLG_NULL 76 4
 BEGIN
   PROMPT 1 9 "Periodo Effetti"
diff --git a/cg/f17.trr b/cg/f17.trr
index 8cc029ae3..45db8c4aa 100755
--- a/cg/f17.trr
+++ b/cg/f17.trr
@@ -1,5 +1,5 @@
 17
-60
+61
 TIPOCF|1|1|0|Tipo <C>liente, <F>ornitore
 CODCF|3|6|0|Codice
 CODINDDOC|2|3|0|Codice indirizzo documenti
@@ -33,6 +33,7 @@ CODABIPR|10|5|0|ABI banca di presentazione effetti
 CODCABPR|10|5|0|CAB banca di presentazione effetti
 CODINDEFF|2|3|0|Indirizzo effetti
 EMEFFRICH|8|1|0|Emissione effetti a richiesta
+RAGGEFF|8|1|0|Raggruppa gli effetti del cliente/fornitore
 IMPMINEFF|3|6|0|Importo minimo effetti
 NONACCEFF|1|20|0|Periodo di non accettazione effetti
 NONSCADEFF|1|20|0|Periodo di non accettazione scadenze effetti
diff --git a/ve/velib06.cpp b/ve/velib06.cpp
index 6fa7dc2bf..e5ed905f4 100755
--- a/ve/velib06.cpp
+++ b/ve/velib06.cpp
@@ -152,6 +152,7 @@ void TDocumento_mask::cli2mask( TCli_for & c, TOccasionale & o, TConfig & ditta)
     set(F_CODABIP, ven_rec.get(CFV_CODABIPR));
     set(F_CODCABP, ven_rec.get(CFV_CODCABPR));
     set(F_RAGGR, ven_rec.get(CFV_RAGGDOC));
+    set(F_RAGGREFF, ven_rec.get(CFV_RAGGEFF));
     set(F_CODINDSP, ven_rec.get(CFV_CODINDSP));
     set(F_CODAG, ven_rec.get(CFV_CODAG));
     set(F_CODSPMEZZO, ven_rec.get(CFV_CODSPMEZZO));