Patch level :10.0

Files correlati     :
Ricompilazione Demo : [ ]
Commento            :
Iniziata contabilizzazione analitica cespiti


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

ce/ce0100.cpp

@@ -3,17 +3,24 @@
 #include <execp.h>
 #include <mailbox.h>
 #include <modaut.h>
+#include <recarray.h>
 #include <tabutil.h>
 #include <tabapp.h>
 
+#include "../ca/calib01.h"
+#include "../ca/cdc.h"
+#include "../ca/commesse.h"
+#include "../ca/fasi.h"
+
 #include "ce0.h"
 #include "celib.h"
 
-#include "cetbtmc.h"
+#include "cetbana.h"
 #include "cetbcac.h"
-#include "cetbcce.h"
 #include "cetbccb.h"
 #include "cetbccc.h"
+#include "cetbcce.h"
+#include "cetbtmc.h"
 
 #define MIN_CAT_COM   40
 
@@ -130,10 +137,89 @@ class TCCC_mask : public TAutomask
 public:
   virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly);
 
-  TCCC_mask() : TAutomask("cetbccc") { }
+  TCCC_mask();
   virtual ~TCCC_mask() { }
 };
 
+//costruttore: se la chiave ha l'analitica fa comparire i campi per cms/cdc/fase
+//se inoltre ha UsePdcc=false (ovvero usa pdc analitico puro) -> ci vogliono anche i conti!
+TCCC_mask::TCCC_mask()
+          : TAutomask("cetbccc")
+{
+  //controllo analitica su chiave
+  const bool has_ca = dongle().active(CAAUT);
+  //se la chiave ha CA -> campi cms/cdc/fase!
+  if (!has_ca)
+    hide(-2);
+  else
+  {
+    show(-2);
+    //Riempie i campi di cdc/cms/fase standard in base a quanto configurato nell'esercizio cespiti
+    const TString& codes = get(F_CODES);
+    const TRectype& rec_cce = cache().get("CCE", codes);
+    const TString& codcdc = rec_cce.get("S2");
+    const TString& descdc = cache().get(LF_CDC, codcdc, CDC_DESCRIZ);
+    set(F_CODCDC, codcdc);
+    set(F_DESCDC, descdc);
+    const TString& codcms = rec_cce.get("S3");
+    const TString& descms = cache().get(LF_COMMESSE, codcms, COMMESSE_DESCRIZ);
+    set(F_CODCMS, codcms);
+    set(F_DESCMS, descms);
+    const TString& codfase = rec_cce.get("S4");
+    //per le fasi è necessario sapere se hanno un padre e quale è!
+    TToken_string key_fasi;
+    TConfig& cfg = ca_config();
+    const TString& fath_fasi = cfg.get("FathFasi");
+    if (fath_fasi.full())
+    {
+      if (fath_fasi == "CMS")
+        key_fasi.add(codcms);
+      else
+        key_fasi.add(codcdc);
+    }
+    else
+      key_fasi.add("");
+
+    key_fasi.add(codfase);
+    const TString& desfase = cache().get(LF_FASI, key_fasi, FASI_DESCRIZ);
+    set(F_CODFASE, codfase);
+    set(F_DESFASE, desfase);
+
+    //se è in uso il piano dei conti analitico puro, dagli di vagonata di campi per i conti, in base alla..
+    //..configurazione del PCONANA!
+    const bool use_pdcc = cfg.get_bool("UsePdcc");
+    if (!use_pdcc)
+    {
+      enable_page(1, false);
+      const int logicnum = LF_PCONANA;
+	    const int nfields = ca_create_fields(*this, 1, LF_PCONANA, 2, 1, F_PDA1_IMM, F_DES1_IMM, 0x0, "S1[1,20]");
+      ca_create_fields(*this, 1, LF_PCONANA, 2, 7, F_PDA1_FON, F_DES1_FON, 0x0, "S1[21,40]");
+      ca_create_fields(*this, 1, LF_PCONANA, 2, 13, F_PDA1_NOR, F_DES1_NOR, 0x0, "S1[41,60]");
+      ca_create_fields(*this, 2, LF_PCONANA, 2, 1, F_PDA1_ACC, F_DES1_ACC, 0x0, "S2[1,20]");
+      ca_create_fields(*this, 2, LF_PCONANA, 2, 7, F_PDA1_ANT, F_DES1_ANT, 0x0, "S2[21,40]");
+
+	    for (int i = 0; i < nfields; i++)
+	    {
+		    TMask_field& immobilizzo = field(F_PDA1_IMM + i);
+		    immobilizzo.set_group(2);
+		    immobilizzo.check_type(CHECK_REQUIRED);
+		    TMask_field& fondo = field(F_PDA1_FON + i);
+		    fondo.set_group(2);
+		    fondo.check_type(CHECK_REQUIRED);
+        TMask_field& normale = field(F_PDA1_NOR + i);
+		    normale.set_group(2);
+		    normale.check_type(CHECK_REQUIRED);
+        TMask_field& accelerato = field(F_PDA1_ACC + i);
+		    accelerato.set_group(2);
+		    accelerato.check_type(CHECK_NORMAL);
+        TMask_field& anticipato = field(F_PDA1_ANT + i);
+		    anticipato.set_group(2);
+		    anticipato.check_type(CHECK_NORMAL);
+	    }
+    }
+  }
+}
+
 bool TCCC_mask::on_field_event(TOperable_field& o, TField_event e, long jolly)
 {             
   switch (o.dlg())

ce/cemenu.men

@@ -80,7 +80,7 @@ Module = 11
 Flags = ""
 Item_01 = "Categorie Collegamento Contabilita'", "ce0 -0 ccc", "F"
 Item_03 = "Stampa Categorie Coll. Cont.", "ba3 -1 ccc" , ""
-Item_02 = "Trasferimento movimenti", "ce4 -3", "F"
+Item_02 = "Contabilizzazione movimenti cespiti", "ce4 -3", "F"
 
 [CEMENU_009]
 Caption = "Operazioni giornaliere e fine esercizio"

ce/cestccc.uml

@@ -45,15 +45,11 @@ BEGIN
    FLAGS "D"
 END
 
-BUTTON DLG_OK 10 2
+ENDPAGE
-BEGIN
-  PROMPT -12 -1 ""
-END
 
-BUTTON DLG_QUIT 10 2
+TOOLBAR "bottombar" 0 0 0 2
-BEGIN
+
-  PROMPT -22 -1 ""
+#include <printbar.h>
-END
 
 ENDPAGE
 ENDMASK

ce/cetbana.h

@@ -0,0 +1,31 @@
+//campi cdc/cms/fase comuni a tutte le tabelle cespiti;
+//sono collegati a numeri alti per evitare casini
+//servono per ora in cetbcce, cetbccc
+#define F_CODCDC        551
+#define F_DESCDC        552
+#define F_CODCMS        553
+#define F_DESCMS        554
+#define F_CODFASE       555
+#define F_DESFASE       556
+
+//campi generati per pconana (se necessari)
+#define	F_PDA1_IMM						601
+#define F_PDA4_IMM						605
+#define	F_PDA1_FON						608
+#define F_PDA4_FON						612
+#define F_PDA1_NOR            613
+#define F_PDA4_NOR            616
+#define F_PDA1_ACC            617
+#define F_PDA4_ACC            620
+#define F_PDA1_ANT            621
+#define F_PDA4_ANT            624
+#define	F_DES1_IMM						701
+#define F_DES4_IMM						705
+#define	F_DES1_FON						708
+#define F_DES4_FON						712
+#define F_DES1_NOR            713
+#define F_DES4_NOR            716
+#define F_DES1_ACC            717
+#define F_DES4_ACC            720
+#define F_DES1_ANT            721
+#define F_DES4_ANT            724

ce/cetbccc.h

@@ -1,15 +1,16 @@
 // campi maschera cetbccc.msk (Collegamenti Cespiti Contabilita')
 
+//categorie
 #define F_CODGR       101
 #define F_CODSP       102
 #define F_CODCAT      103
 #define F_CODCAT_IN   104
-#define F_DESCGR     105
+#define F_DESCGR      105
-#define F_DESCSP     106
+#define F_DESCSP      106
-#define F_DESCCAT    107
+#define F_DESCCAT     107
-#define F_DESCCAT_IN 108
+#define F_DESCCAT_IN  108
 
-//Pagina 1
+//conti
 #define F_IMM_GR      201
 #define F_IMM_CO      202
 #define F_IMM_SOT     203
@@ -30,3 +31,6 @@
 #define F_QACC_CO     218
 #define F_QACC_SOT    219
 #define F_QACC_DES    220
+
+//conti analitici
+#define F_CODES       231

ce/cetbccc.uml

@@ -1,21 +1,22 @@
 #include "cetbccc.h"
+#include "cetbana.h"
 #include <deftabap.h>
 
 TOOLBAR "topbar" 0 0 0 2
 #include <relapbar.h>
 ENDPAGE
 
-PAGE "Categorie collegate CG" 0 2 0 0
+PAGE "Categorie collegate CG/CA" 0 2 0 0
 
 GROUPBOX DLG_NULL 75 5
 BEGIN
-  PROMPT 1 1 "@BCategorie"
+  PROMPT 1 0 "@BCategorie"
   FLAGS "R"
 END
 
 NUMBER F_CODGR 2
 BEGIN
-  PROMPT 2 2 "Gruppo    "
+  PROMPT 2 1 "Gruppo    "
   FIELD CODTAB[1,2]
   FLAGS "Z"
   KEY 1
@@ -31,13 +32,13 @@ END
 
 STRING F_DESCGR 60 50
 BEGIN
-  PROMPT 20 2 ""
+  PROMPT 20 1 ""
   FLAGS "D"
 END
 
 STRING F_CODSP 4
 BEGIN
-  PROMPT 2 3 "Specie    "
+  PROMPT 2 2 "Specie    "
   FIELD CODTAB[3,6]
   FLAGS "_"
   KEY 1
@@ -57,13 +58,13 @@ END
 
 STRING F_DESCSP 60 50
 BEGIN
-  PROMPT 20 3 ""
+  PROMPT 20 2 ""
   FLAGS "D"
 END
 
 NUMBER F_CODCAT 2
 BEGIN
-  PROMPT 2 4 "Categoria "
+  PROMPT 2 3 "Categoria "
   FIELD CODTAB[7,8]
   FLAGS "UZ"
   KEY 1
@@ -85,7 +86,7 @@ END
 
 NUMBER F_CODCAT_IN 2
 BEGIN
-  PROMPT 2 4 "Categoria "
+  PROMPT 2 3 "Categoria "
   FLAGS "BUZDH"
   KEY 1
   DRIVENBY F_CODGR
@@ -97,39 +98,39 @@ END
 
 STRING F_DESCCAT 60 50
 BEGIN
-  PROMPT 20 4 ""
+  PROMPT 20 3 ""
   FLAGS "D"
 END
 
 GROUPBOX DLG_NULL 74 8
 BEGIN
-  PROMPT 1 6 "@bConti per attivita'"
+  PROMPT 1 5 "@bConti per attivita'"
   FLAGS "R"
 END
 
 TEXT -1
 BEGIN
-  PROMPT 15 7 "@BGruppo"
+  PROMPT 15 6 "@BGruppo"
 END
 
 TEXT -1
 BEGIN
-  PROMPT 22 7 "@BConto"
+  PROMPT 22 6 "@BConto"
 END
 
 TEXT -1
 BEGIN
-  PROMPT 29 7 "@BSottoconto"
+  PROMPT 29 6 "@BSottoconto"
 END
 
 TEXT -1
 BEGIN
-  PROMPT 39 7 "@BDescrizione"
+  PROMPT 39 6 "@BDescrizione"
 END
 
 NUMBER F_IMM_GR 3
 BEGIN
-  PROMPT 2 8 "Immobilizzo  "
+  PROMPT 2 7 "Immobilizzo  "
   FIELD S1[1,3]
   FLAGS "Z"
   USE LF_PCON SELECT CONTO=""
@@ -143,7 +144,7 @@ END
 
 NUMBER F_IMM_CO 3
 BEGIN
-  PROMPT 22 8 ""
+  PROMPT 22 7 ""
   FIELD S1[4,6]
   FLAGS "Z"
   USE LF_PCON SELECT ((CONTO!="")&&(SOTTOCONTO="")&&((INDBIL==1)||(INDBIL==2)))
@@ -161,7 +162,7 @@ END
 
 NUMBER F_IMM_SOT 6
 BEGIN
-  PROMPT 29 8 ""
+  PROMPT 29 7 ""
   FIELD S1[7,12]
   FLAGS "Z"
   USE LF_PCON SELECT SOTTOCONTO!=""
@@ -180,7 +181,7 @@ END
 
 STRING F_IMM_DES 50 32
 BEGIN
-  PROMPT 39 8 ""
+  PROMPT 39 7 ""
   USE LF_PCON KEY 2 SELECT SOTTOCONTO!=""
   INPUT DESCR F_IMM_DES
   DISPLAY "Descrizione@50" DESCR
@@ -194,7 +195,7 @@ END
 
 NUMBER F_FON_GR 3
 BEGIN
-  PROMPT 2 9 "Fondo        "
+  PROMPT 2 8 "Fondo        "
   FIELD S1[13,15]
   FLAGS "Z"
   USE LF_PCON SELECT CONTO=""
@@ -208,7 +209,7 @@ END
 
 NUMBER F_FON_CO 3
 BEGIN
-  PROMPT 22 9 ""
+  PROMPT 22 8 ""
   FIELD S1[16,18]
   FLAGS "Z"
   USE LF_PCON SELECT ((CONTO!="")&&(SOTTOCONTO="")&&((INDBIL==1)||(INDBIL==2)))
@@ -226,7 +227,7 @@ END
 
 NUMBER F_FON_SOT 6
 BEGIN
-  PROMPT 29 9 ""
+  PROMPT 29 8 ""
   FIELD S1[19,24]
   FLAGS "Z"
   USE LF_PCON SELECT SOTTOCONTO!=""
@@ -245,7 +246,7 @@ END
 
 STRING F_FON_DES 50 32
 BEGIN
-  PROMPT 39 9 ""
+  PROMPT 39 8 ""
   USE LF_PCON KEY 2 SELECT SOTTOCONTO!=""
   INPUT DESCR F_FON_DES
   DISPLAY "Descrizione@50" DESCR
@@ -259,7 +260,7 @@ END
 
 NUMBER F_QNOR_GR 3
 BEGIN
-  PROMPT 2 10 "Amm. Normali "
+  PROMPT 2 9 "Amm. Normali "
   FIELD S1[25,27]
   FLAGS "Z"
   USE LF_PCON SELECT CONTO=""
@@ -273,7 +274,7 @@ END
 
 NUMBER F_QNOR_CO 3
 BEGIN
-  PROMPT 22 10 ""
+  PROMPT 22 9 ""
   FIELD S1[28,30]
   FLAGS "Z"
   USE LF_PCON SELECT ((CONTO!="")&&(SOTTOCONTO="")&&(INDBIL==3))
@@ -291,7 +292,7 @@ END
 
 NUMBER F_QNOR_SOT 6
 BEGIN
-  PROMPT 29 10 ""
+  PROMPT 29 9 ""
   FIELD S1[31,36]
   FLAGS "Z"
   USE LF_PCON SELECT SOTTOCONTO!=""
@@ -310,7 +311,7 @@ END
 
 STRING F_QNOR_DES 50 32
 BEGIN
-  PROMPT 39 10 ""
+  PROMPT 39 9 ""
   USE LF_PCON KEY 2 SELECT SOTTOCONTO!=""
   INPUT DESCR F_QNOR_DES
   DISPLAY "Descrizione@50" DESCR
@@ -324,7 +325,7 @@ END
 
 NUMBER F_QANT_GR 3
 BEGIN
-  PROMPT 2 11 "Amm. Anticip."
+  PROMPT 2 10 "Amm. Anticip."
   FIELD S1[37,39]
   FLAGS "Z"
   USE LF_PCON SELECT CONTO=""
@@ -338,7 +339,7 @@ END
 
 NUMBER F_QANT_CO 3
 BEGIN
-  PROMPT 22 11 ""
+  PROMPT 22 10 ""
   FIELD S1[40,42]
   FLAGS "Z"
   USE LF_PCON SELECT ((CONTO!="")&&(SOTTOCONTO="")&&(INDBIL==3))
@@ -356,7 +357,7 @@ END
 
 NUMBER F_QANT_SOT 6
 BEGIN
-  PROMPT 29 11 ""
+  PROMPT 29 10 ""
   FIELD S1[43,48]
   FLAGS "Z"
   USE LF_PCON SELECT SOTTOCONTO!=""
@@ -375,7 +376,7 @@ END
 
 STRING F_QANT_DES 50 32
 BEGIN
-  PROMPT 39 11 ""
+  PROMPT 39 10 ""
   USE LF_PCON KEY 2 SELECT SOTTOCONTO!=""
   INPUT DESCR F_QANT_DES
   DISPLAY "Descrizione@50" DESCR
@@ -389,7 +390,7 @@ END
 
 NUMBER F_QACC_GR 3
 BEGIN
-  PROMPT 2 12 "Amm. Accel.  "
+  PROMPT 2 11 "Amm. Accel.  "
   FIELD S1[49,51]
   FLAGS "Z"
   USE LF_PCON SELECT CONTO=""
@@ -403,7 +404,7 @@ END
 
 NUMBER F_QACC_CO 3
 BEGIN
-  PROMPT 22 12 ""
+  PROMPT 22 11 ""
   FIELD S1[52,54]
   FLAGS "Z"
   USE LF_PCON SELECT ((CONTO!="")&&(SOTTOCONTO="")&&(INDBIL==3))
@@ -421,7 +422,7 @@ END
 
 NUMBER F_QACC_SOT 6
 BEGIN
-  PROMPT 29 12 ""
+  PROMPT 29 11 ""
   FIELD S1[55,60]
   FLAGS "Z"
   USE LF_PCON SELECT SOTTOCONTO!=""
@@ -440,7 +441,7 @@ END
 
 STRING F_QACC_DES 50 32
 BEGIN
-  PROMPT 39 12 ""
+  PROMPT 39 11 ""
   USE LF_PCON KEY 2 SELECT SOTTOCONTO!=""
   INPUT DESCR F_QACC_DES
   DISPLAY "Descrizione@50" DESCR
@@ -452,6 +453,100 @@ BEGIN
   CHECKTYPE NORMAL
 END
 
+GROUPBOX DLG_NULL 74 6
+BEGIN
+  PROMPT 1 13 "@bCdc/Commessa/Fase standard per ripartizione fondi (da configurazione esercizio cespiti)"
+  FLAGS "R"
+  GROUP 2
+END
+
+NUMBER F_CODES 4
+BEGIN
+  PROMPT 2 14 "Esercizio cespiti corrente"
+  FLAGS "AD"
+  GROUP 2
+END
+
+STRING F_CODCDC 20
+BEGIN
+  PROMPT 2 15 "C.d.costo "
+  FLAGS "D"
+  GROUP 2
+END
+
+STRING F_DESCDC 50 37
+BEGIN
+  PROMPT 35 15 ""
+  FLAGS "D"
+  GROUP 2
+END
+
+STRING F_CODCMS 20
+BEGIN
+  PROMPT 2 16 "Commessa  "
+  FLAGS "D"
+  GROUP 2
+END
+
+STRING F_DESCMS 50 37
+BEGIN
+  PROMPT 35 16 ""
+  FLAGS "D"
+  GROUP 2
+END
+
+STRING F_CODFASE 10
+BEGIN
+  PROMPT 2 17 "Fase      "
+  FLAGS "D"
+  GROUP 2
+END
+
+STRING F_DESFASE 50 37
+BEGIN
+  PROMPT 35 17 ""
+  FLAGS "D"
+  GROUP 2
+END
+
+ENDPAGE
+
+PAGE "Conti CA - 1" 0 2 0 0
+
+GROUPBOX DLG_NULL 76 6
+BEGIN
+  PROMPT 1 0 "@bImmobilizzo"
+  GROUP 2
+END
+
+GROUPBOX DLG_NULL 76 6
+BEGIN
+  PROMPT 1 6 "@bFondo"
+  GROUP 2
+END
+
+GROUPBOX DLG_NULL 76 6
+BEGIN
+  PROMPT 1 12 "@bAmm. Normali"
+  GROUP 2
+END
+
+ENDPAGE
+
+PAGE "Conti CA - 2" 0 2 0 0
+
+GROUPBOX DLG_NULL 76 6
+BEGIN
+  PROMPT 1 0 "@bAmm. Accelerati"
+  GROUP 2
+END
+
+GROUPBOX DLG_NULL 76 6
+BEGIN
+  PROMPT 1 6 "@bAmm. Anticipati"
+  GROUP 2
+END
+
 ENDPAGE
 
 ENDMASK

ce/cetbcce.h

@@ -24,11 +24,3 @@
 #define F_AMMCIV2008  132
 #define F_AMMGES2008  133
 #define F_AMMAUT2008  134
-
-//campi pagina Analitica
-#define F_CODCDC        201
-#define F_DESCDC        202
-#define F_CODCMS        203
-#define F_DESCMS        204
-#define F_CODFASE       205
-#define F_DESFASE       206

ce/cetbcce.uml

@@ -1,4 +1,5 @@
 #include "cetbcce.h"
+#include "cetbana.h"
 
 TOOLBAR "topbar" 0 0 0 2
 #include <relapbar.h>