From b88c9f10b63318134c341517b25d61797dfd1523 Mon Sep 17 00:00:00 2001
From: alex <alex@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Mon, 24 Jun 1996 08:57:29 +0000
Subject: [PATCH] Correzioni alle maschere (eliminato FLD_CM1_CODANALISIH)

git-svn-id: svn://10.65.10.50/trunk@3072 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 cg/cg0100.cpp  | 10 +++++-----
 cg/cg0100.h    | 13 ++++++-------
 cg/cg0100a.uml | 11 -----------
 cg/cg0200a.uml | 22 +++++++++++-----------
 4 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/cg/cg0100.cpp b/cg/cg0100.cpp
index 5c6cb305e..486bbd215 100755
--- a/cg/cg0100.cpp
+++ b/cg/cg0100.cpp
@@ -285,15 +285,15 @@ void CG0100_application::init_insert_mode(TMask& m)
   }
   if (s.not_empty())
   {
-    m.set(FLD_CM1_CODANALISIH, s);     
-    m.show(FLD_CM1_CODANALISIH);
-    m.hide(FLD_CM1_CODTABANALISI);
+    m.set(FLD_CM1_CODTABANALISI, s);
+    m.check_field(FLD_CM1_CODTABANALISI);
+    m.disable(FLD_CM1_CODTABANALISI);
     m.disable(FLD_CM1_DESCRANALISI);
   }
   else
   {
-    m.show(FLD_CM1_CODTABANALISI);
-    m.hide(FLD_CM1_CODANALISIH);
+
+    m.enable(FLD_CM1_CODTABANALISI);
     m.enable(FLD_CM1_DESCRANALISI);
   }
   const bool enable_sezsaldi = (sottoc != 0) || (sottoc == 0 && conto != 0 && m.get(FLD_CM1_TMCF).not_empty());
diff --git a/cg/cg0100.h b/cg/cg0100.h
index 777f2f21d..e3d87c60f 100755
--- a/cg/cg0100.h
+++ b/cg/cg0100.h
@@ -8,8 +8,8 @@
 //      campi maschera cg0100a.msk
 
 #define FLD_CM1_GRUPPO                  101
-#define FLD_CM1_CONTO                           102
-#define FLD_CM1_SOTTOCONTO      103
+#define FLD_CM1_CONTO                   102
+#define FLD_CM1_SOTTOCONTO              103
 #define FLD_CM1_DESC                    104
 #define FLD_CM1_CODTABANALISI           105
 #define FLD_CM1_SEZIVD                  106
@@ -19,13 +19,12 @@
 #define FLD_CM1_INDBIL                  110
 #define FLD_CM1_TMCF                    111
 #define FLD_CM1_TIPOSPRIC               112
-#define FLD_CM1_DTIPOSPRIC      117
+#define FLD_CM1_DTIPOSPRIC              117
 #define FLD_CM1_SEZIVDOPP               113
-#define FLD_CM1_LETTIVDOPP      114
-#define FLD_CM1_NUMRIVDOPP      115
+#define FLD_CM1_LETTIVDOPP              114
+#define FLD_CM1_NUMRIVDOPP              115
 #define FLD_CM1_NUMIVDOPP               116
-#define FLD_CM1_CODANALISIH     118
-#define FLD_CM1_SEZIVDH         119
+#define FLD_CM1_SEZIVDH                 119
 #define FLD_CM1_LETTIVDH                120
 #define FLD_CM1_NUMRIVDH                121
 #define FLD_CM1_NUMIVDH                 122
diff --git a/cg/cg0100a.uml b/cg/cg0100a.uml
index 9758e1396..072e37a45 100755
--- a/cg/cg0100a.uml
+++ b/cg/cg0100a.uml
@@ -130,17 +130,6 @@ BEGIN
   WARNING "Codice tabella non presente"
   FLAGS "Z"
   ADD RUN AB0 -1
-  MESSAGE COPY,FLD_CM1_CODANALISIH|DIRTY,FLD_CM1_CODANALISIH|K_TAB,FLD_CM1_CODANALISIH
-END
-
-NUMBER FLD_CM1_CODANALISIH 10
-BEGIN
-  PROMPT 1 5 "Codice Tabella Analisi "
-  FLAGS "ZHD"
-  USE LF_ABPCON
-  INPUT CODCBL FLD_CM1_CODANALISIH
-  OUTPUT FLD_CM1_DESCRANALISI DESCRIZ[1,40]
-  CHECKTYPE NORMAL
 END
 
 STRING FLD_CM1_DESCRANALISI 40
diff --git a/cg/cg0200a.uml b/cg/cg0200a.uml
index d95cd6bc1..8ed05e2bb 100755
--- a/cg/cg0200a.uml
+++ b/cg/cg0200a.uml
@@ -13,7 +13,7 @@ BEGIN
   PROMPT 1 0 "Dati identificativi"
 END
 
-LIST F_TIPOCF 1 12
+LIST F_TIPOCF 1 11
 BEGIN
   PROMPT 2 1 "Tipo   "
   FIELD TIPOCF
@@ -55,7 +55,7 @@ END
 
 STRING F_RAGSOC 30
 BEGIN
-  PROMPT 24 1 "Cognome / Rag. Soc."
+  PROMPT 23 1 "Cognome / Rag. Soc.  "
   FIELD RAGSOC[1,30]
   KEY 2
   USE LF_CLIFO KEY 2
@@ -75,7 +75,7 @@ END
 
 STRING F_RAGSOCA 20
 BEGIN
-  PROMPT 24 2 "Nome / Seconda parte Rag. Soc. "
+  PROMPT 23 2 "Nome / Seconda parte Rag. Soc. "
   FIELD RAGSOC[31,]
   KEY 2
   HELP "Seconda parte della ragione sociale o nome"
@@ -342,7 +342,7 @@ BEGIN
 PROMPT 1 0 "Dati identificativi"
 END
 
-LIST DLG_NULL 1 12
+LIST DLG_NULL 1 11
 BEGIN
 PROMPT 2 1 "Tipo   "
 FLAGS "D"
@@ -564,7 +564,7 @@ BEGIN
 PROMPT 1 0 "Dati identificativi"
 END
 
-LIST DLG_NULL 1 12
+LIST DLG_NULL 1 11
 BEGIN
 PROMPT 2 1 "Tipo   "
 FLAGS "D"
@@ -841,9 +841,9 @@ USE LF_PCON SELECT (CONTO!="")&&(SOTTOCONTO="")&&(TMCF=#F_TIPOCF)
   PROMPT 1 0 "Dati identificativi"
   END
 
-  LIST DLG_NULL 1 12
+  LIST DLG_NULL 1 11
   BEGIN
-  PROMPT 2 1 "Tipo  "
+  PROMPT 2 1 "Tipo   "
   FIELD LF_INDSP->TIPOCF
   FLAGS "D"
   GROUP 1
@@ -900,7 +900,7 @@ USE LF_PCON SELECT (CONTO!="")&&(SOTTOCONTO="")&&(TMCF=#F_TIPOCF)
   PROMPT 1 0 "Dati identificativi"
   END
 
-  LIST F_TIPOCFVEN 1 12
+  LIST F_TIPOCFVEN 1 11
   BEGIN
   PROMPT 2 1 "Tipo   "
   FIELD LF_CFVEN->TIPOCF
@@ -1063,7 +1063,7 @@ USE LF_PCON SELECT (CONTO!="")&&(SOTTOCONTO="")&&(TMCF=#F_TIPOCF)
   PROMPT 1 0 "Dati identificativi"
   END
 
-  LIST DLG_NULL 1 12
+  LIST DLG_NULL 1 11
   BEGIN
   PROMPT 2 1 "Tipo   "
   FLAGS "DG"
@@ -1346,7 +1346,7 @@ USE LF_PCON SELECT (CONTO!="")&&(SOTTOCONTO="")&&(TMCF=#F_TIPOCF)
   PROMPT 1 0 "Dati identificativi"
   END
 
-  LIST DLG_NULL 1 12
+  LIST DLG_NULL 1 11
   BEGIN
   PROMPT 2 1 "Tipo   "
   FLAGS "D"
@@ -1521,7 +1521,7 @@ USE LF_PCON SELECT (CONTO!="")&&(SOTTOCONTO="")&&(TMCF=#F_TIPOCF)
   PROMPT 1 0 "Dati identificativi"
   END
 
-  LIST DLG_NULL 1 12
+  LIST DLG_NULL 1 11
   BEGIN
   PROMPT 2 1 "Tipo   "
   FLAGS "D"