From 0449fed52db155553d49675a2036a6cf04229087 Mon Sep 17 00:00:00 2001
From: alex <alex@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Thu, 23 Jun 2011 15:46:10 +0000
Subject: [PATCH] Patch level         : 10.1036 Files correlati     :
 Ricompilazione Demo : [ ] Commento            :

Cambiato il nome del campo NOPROFIT in CONTSEP


git-svn-id: svn://10.65.10.50/branches/R_10_00@22314 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 cg/cg2100.h    |  4 ++--
 cg/cg2100b.uml | 20 +++++++++-----------
 cg/cg2100c.uml | 19 +++++++++----------
 cg/f23.trr     |  2 +-
 np/nptbent.uml |  2 +-
 5 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/cg/cg2100.h b/cg/cg2100.h
index 50dae8cb3..ca59f2002 100755
--- a/cg/cg2100.h
+++ b/cg/cg2100.h
@@ -35,8 +35,8 @@
 #define F_RICALTFORNITORE 166
 #define F_CONTRATTOF      167
 
-#define F_NOPROFIT        168
-#define F_DESNOPROFIT     169
+#define F_CONTSEP         168
+#define F_DESCONTSEP      169
 
 #define F_GRUPPOCLIFO 170
 #define F_CONTOCLIFO 171
diff --git a/cg/cg2100b.uml b/cg/cg2100b.uml
index 565ac48d3..e123c224e 100755
--- a/cg/cg2100b.uml
+++ b/cg/cg2100b.uml
@@ -255,32 +255,30 @@ BEGIN
   GROUP 5 6
 END
 
-STRING F_NOPROFIT 6
+STRING F_CONTSEP 6
 BEGIN
-  PROMPT 1 19 "Gest. No-profit  "
+  PROMPT 1 19 "Contab.separata  "
   USE &NPENT
-  INPUT CODTAB F_NOPROFIT
+  INPUT CODTAB F_CONTSEP
   DISPLAY "Codice@6" CODTAB
   DISPLAY "Descrizione@50" S0
-  OUTPUT F_NOPROFIT CODTAB
-  OUTPUT F_DESNOPROFIT S0
+  OUTPUT F_CONTSEP CODTAB
+  OUTPUT F_DESCONTSEP S0
   CHECKTYPE NORMAL
-  FIELD NOPROFIT
+  FIELD CONTSEP
 END
 
-STRING F_DESNOPROFIT 50 48
+STRING F_DESCONTSEP 50
 BEGIN
   PROMPT 27 19 ""
   USE &NPENT KEY 2
-  INPUT S0 F_DESNOPROFIT
+  INPUT S0 F_DESCONTSEP
   DISPLAY "Descrizione@50" S0
   DISPLAY "Codice@6" CODTAB
-  COPY OUTPUT F_NOPROFIT
+  COPY OUTPUT F_CONTSEP
   CHECKTYPE NORMAL
 END
 
-
-
 ENDPAGE
 
 PAGE "Righe" -1 -1 77 20
diff --git a/cg/cg2100c.uml b/cg/cg2100c.uml
index 9316162aa..9fa8454a7 100755
--- a/cg/cg2100c.uml
+++ b/cg/cg2100c.uml
@@ -644,31 +644,30 @@ BEGIN
   DRIVENBY F_VALUTAINTRA
 END
 
-STRING F_NOPROFIT 6
+STRING F_CONTSEP 6
 BEGIN
-  PROMPT 1 19 "Gest. No-profit  "
+  PROMPT 1 19 "Contab.separata  "
   USE &NPENT
-  INPUT CODTAB F_NOPROFIT
+  INPUT CODTAB F_CONTSEP
   DISPLAY "Codice@6" CODTAB
   DISPLAY "Descrizione@50" S0
-  OUTPUT F_NOPROFIT CODTAB
-  OUTPUT F_DESNOPROFIT S0
+  OUTPUT F_CONTSEP CODTAB
+  OUTPUT F_DESCONTSEP S0
   CHECKTYPE NORMAL
-  FIELD NOPROFIT
+  FIELD CONTSEP
 END
 
-STRING F_DESNOPROFIT 50 48
+STRING F_DESCONTSEP 50
 BEGIN
   PROMPT 27 19 ""
   USE &NPENT KEY 2
-  INPUT S0 F_DESNOPROFIT
+  INPUT S0 F_DESCONTSEP
   DISPLAY "Descrizione@50" S0
   DISPLAY "Codice@6" CODTAB
-  COPY OUTPUT F_NOPROFIT
+  COPY OUTPUT F_CONTSEP
   CHECKTYPE NORMAL
 END
 
-
 BUTTON F_ADJUST_PRORATA 40
 BEGIN
   PROMPT 1 -1 "Corre~zione automatica righe contabili"
diff --git a/cg/f23.trr b/cg/f23.trr
index 4ec23a2e9..d706b3c73 100755
--- a/cg/f23.trr
+++ b/cg/f23.trr
@@ -48,7 +48,7 @@ DNDOC|3|7|0|Documento originale NDOC
 DATAINC|5|8|0|Data di incasso per liquidazione differita
 LIQDIFF|8|1|0|Flag di movimento a liquidazione differita
 CONTRATTO|1|18|0|Contratto con importo > 3000 Euro
-NOPROFIT|1|6|0|Tipo di ente NO-PROFIT
+CONTSEP|1|6|0|Contabilita' separata
 4
 NUMREG| 
 DATAREG+NUMREG|X
diff --git a/np/nptbent.uml b/np/nptbent.uml
index 94b15ba3c..bfa3d30f1 100755
--- a/np/nptbent.uml
+++ b/np/nptbent.uml
@@ -4,7 +4,7 @@ TOOLBAR "topbar" 0 0 0 2
 #include <relapbar.h>
 ENDPAGE
 
-PAGE "Tipo No-profit" 0 2 0 0
+PAGE "Contabilità separata" 2 0 0
 
 STRING F_CODICE 6
 BEGIN