Patch level :2.0 426

Files correlati     :cg0.exe,cg0100a.msk
Ricompilazione Demo : [ ]
Commento            :
CM600195
Se la riclassificazione è a livello di gruppo/conto, anche il campo della descrizione non
deve essere attivo.


git-svn-id: svn://10.65.10.50/trunk@10931 c028cbd2-c16b-5b4b-a496-9718f37d4682

cg/cg0100.cpp

@@ -1,3 +1,4 @@
+#include <recarray.h>
 #include <relapp.h>
 #include <defmask.h>
 
@@ -207,7 +208,8 @@ void TCausali_app::init_insert_mode(TMask& m)
       m.hide(-3);
 
   TLocalisamfile& pconti = _rel->lfile();
-  TString s(15), s2(1), s3(8), s4(2);
+  TString s, s2, s5;
+  TString8 s3, s4;
   int s1 = 0;
 
   pconti.setkey(1) ;
@@ -223,10 +225,21 @@ void TCausali_app::init_insert_mode(TMask& m)
     if (pconti.good())
     {
       s = pconti.get(PCN_CODCBL);
-      s1 = atoi(pconti.get(PCN_SEZIVD));
+      s1 = pconti.get_int(PCN_SEZIVD);
       s2 = pconti.get(PCN_LETTIVD);
       s3 = pconti.get(PCN_NUMRIVD);
       s4 = pconti.get(PCN_NUMIVD);
+      if (s3.empty())
+        s3 = "    ";
+      else
+        s3.right_just(4,'0');
+
+      if (!s4.empty())
+        s4.right_just(2,'0');
+
+      TString8 key;
+      key.format("%1d%1s%s%s", s1, (const char*) s2,(const char*) s3, (const char*) s4);
+      s5 = cache().get("%IVD", key, "S0"); //
       indbil = pconti.get_int(PCN_INDBIL);
     }
     ivd_enable =  (s1 == 0) && s2.empty() && s3.empty() && s4.empty();
@@ -239,20 +252,24 @@ void TCausali_app::init_insert_mode(TMask& m)
     m.show(FLD_CM1_LETTIVD, ivd_enable);
     m.show(FLD_CM1_NUMRIVD, ivd_enable);
     m.show(FLD_CM1_NUMIVD, ivd_enable);
+    m.show(FLD_CM1_DESCIVD, ivd_enable); //
     if (!ivd_enable)
     {
       m.set(FLD_CM1_SEZIVD, s1);
       m.set(FLD_CM1_LETTIVDH, s2);
       m.set(FLD_CM1_NUMRIVDH, s3);
       m.set(FLD_CM1_NUMIVDH, s4);
+      m.set(FLD_CM1_DESCIVDH, s5); //
       m.enable(FLD_CM1_SEZIVDOPP);
       m.disable(FLD_CM1_LETTIVDH);
       m.disable(FLD_CM1_NUMRIVDH);
       m.disable(FLD_CM1_NUMIVDH);
+      m.disable(FLD_CM1_DESCIVDH); //
     }
     m.show(FLD_CM1_LETTIVDH, !ivd_enable);
     m.show(FLD_CM1_NUMRIVDH, !ivd_enable);
     m.show(FLD_CM1_NUMIVDH, !ivd_enable);
+    m.show(FLD_CM1_DESCIVDH, !ivd_enable); //
     pconti.zero();
     pconti.put(PCN_GRUPPO, gruppo);
     pconti.read();

cg/cg0100.h

@@ -24,7 +24,7 @@
 #define FLD_CM1_NUMRIVDOPP              115
 #define FLD_CM1_NUMIVDOPP               116
 #define FLD_CM1_DTIPOSPRIC              117
-//#define FLD_CM1_SEZIVDH                 119
+
 #define FLD_CM1_LETTIVDH                120
 #define FLD_CM1_NUMRIVDH                121
 #define FLD_CM1_NUMIVDH                 122
@@ -34,6 +34,7 @@
 #define FLD_CM1_DESCIVACOMP             126
 #define FLD_CM1_DESCIVD                 127
 #define FLD_CM1_DESCIVDOPP              128
+#define FLD_CM1_DESCIVDH                129
 
 #define FLD_CM2_STSOTTBIL               200
 #define FLD_CM2_STSOTTAB                201

cg/cg0100a.uml

@@ -241,7 +241,6 @@ END
 STRING FLD_CM1_DESCIVD 70 50
 BEGIN
   PROMPT 24 8 ""
-  GROUP 1 5
   USE %IVD KEY 2
   INPUT S0 FLD_CM1_DESCIVD
   DISPLAY "Descrizione@50" S0
@@ -251,6 +250,14 @@ BEGIN
   DISPLAY "Numero" CODTAB[7,8]
   COPY OUTPUT FLD_CM1_NUMIVD
   CHECKTYPE NORMAL
+  GROUP 1 5
+END
+
+STRING FLD_CM1_DESCIVDH 70 50
+BEGIN
+  PROMPT 24 8 ""
+  FLAGS "HD"
+  GROUP 1 5
 END
 
 LIST FLD_CM1_SEZIVDOPP 1 22