From f5a78cf8e2603de5dd3d856db0ae2a0727ea0e4c Mon Sep 17 00:00:00 2001 From: guy Date: Wed, 22 Oct 2008 15:26:17 +0000 Subject: [PATCH] Patch level : 10.0 Files correlati : cg0.exe cg0500a.msk Ricompilazione Demo : [ ] Commento : git-svn-id: svn://10.65.10.50/trunk@17455 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- cg/cg0500.h | 74 +++++++++++++++++++++++++------------------------- cg/cg0500a.uml | 2 +- cg/cg0500b.uml | 4 +-- cg/cg3300.h | 2 +- cg/cg3301.cpp | 30 ++++++++------------ 5 files changed, 52 insertions(+), 60 deletions(-) diff --git a/cg/cg0500.h b/cg/cg0500.h index 052a94e9e..8290e2fa2 100755 --- a/cg/cg0500.h +++ b/cg/cg0500.h @@ -1,42 +1,43 @@ // cg0500.h -#define F_COD_CAUS 100 -#define F_DESCR 101 -#define F_TIPO_DOC 102 -#define F_COD_REG 103 -#define F_DATA_DOC 104 -#define F_NUM_DOC 105 -#define F_MOV_SEZ 106 -#define F_TIPO_MOV_1 107 -#define F_TIPO_MOV_2 108 -#define F_AUTO_FAT 109 -#define F_MOV_VALU 110 -#define F_COD_CAUS_IM 111 -#define F_FAT_RITARDO 112 -#define F_OP_INTRACOM 113 -#define F_ALLEGAT 114 -#define F_VAL_INTRACOM 115 -#define F_COLL_CESP 116 -#define F_M_770 117 -#define F_COLL_PRIMANOTA 118 -#define F_SHEET_GCS 201 -#define F_TIPO_REG 120 -#define F_ANNOES 121 -#define F_TIPO_MOV 122 -#define F_OP_FINE_ANNO 123 -#define F_VALINTRA 124 -#define F_CORRISP 125 -#define F_COD_CAUS2 126 -#define F_DESCR2 127 -#define F_DES_DOC 128 -#define F_DES_REG 129 -#define F_MOVIND 130 -#define F_SOLAIVA 131 -#define F_PROVV 132 -#define F_CODCAUREG 133 -#define F_REGSPIVA 134 -#define F_LIQDIFF 135 +#define F_COD_CAUS 200 +#define F_DESCR 201 +#define F_TIPO_DOC 202 +#define F_COD_REG 203 +#define F_DATA_DOC 204 +#define F_NUM_DOC 205 +#define F_MOV_SEZ 206 +#define F_TIPO_MOV_1 207 +#define F_TIPO_MOV_2 208 +#define F_AUTO_FAT 209 +#define F_MOV_VALU 210 +#define F_COD_CAUS_IM 211 +#define F_FAT_RITARDO 212 +#define F_OP_INTRACOM 213 +#define F_ALLEGAT 214 +#define F_VAL_INTRACOM 215 +#define F_COLL_CESP 216 +#define F_M_770 217 +#define F_COLL_PRIMANOTA 218 +#define F_SHEET_GCS 219 +#define F_TIPO_REG 220 +#define F_ANNOES 221 +#define F_TIPO_MOV 222 +#define F_OP_FINE_ANNO 223 +#define F_VALINTRA 224 +#define F_CORRISP 225 +#define F_COD_CAUS2 226 +#define F_DESCR2 227 +#define F_DES_DOC 228 +#define F_DES_REG 229 +#define F_MOVIND 230 +#define F_SOLAIVA 231 +#define F_PROVV 232 +#define F_CODCAUREG 233 +#define F_REGSPIVA 234 +#define F_LIQDIFF 235 +#define SS_TIPO 101 #define SS_SEZIONE 102 #define SS_TIPOCF 103 #define SS_GRUPPO 104 @@ -44,4 +45,3 @@ #define SS_SOTTOCONTO 106 #define SS_DESCAGG 108 #define SS_DESCRIPTION 109 -#define SS_AZZERA 200 diff --git a/cg/cg0500a.uml b/cg/cg0500a.uml index 2a60cf213..4ca98dc57 100755 --- a/cg/cg0500a.uml +++ b/cg/cg0500a.uml @@ -174,7 +174,7 @@ END SPREADSHEET F_SHEET_GCS BEGIN - PROMPT 0 7 "" + PROMPT 0 7 "Righe" ITEM "Tipo conto@21F" ITEM "D/A@3" ITEM "C/F@3" diff --git a/cg/cg0500b.uml b/cg/cg0500b.uml index b96cbea7d..ae39ea7c3 100755 --- a/cg/cg0500b.uml +++ b/cg/cg0500b.uml @@ -2,7 +2,7 @@ PAGE "" -1 -1 68 11 -STRING 101 21 +STRING SS_TIPO 21 BEGIN PROMPT 1 1 "Tipo " FLAGS "D" @@ -249,7 +249,7 @@ BEGIN PROMPT -23 -1 "" END -BUTTON SS_AZZERA 10 2 +BUTTON DLG_USER 10 2 BEGIN PROMPT -33 -1 "A~zzera" MESSAGE RESET,1@ diff --git a/cg/cg3300.h b/cg/cg3300.h index e0b57684a..4c113c50d 100755 --- a/cg/cg3300.h +++ b/cg/cg3300.h @@ -126,7 +126,7 @@ protected: public: void azzera_struttura(); bool fill_dati_anag_dic (const TRectype & ditta); - const char * fill_dati_dettaglio (const char * tipo, long codcf); + const char * fill_dati_dettaglio (char tipo, long codcf); const char * Strutt_str() { return (const char *) _all; } struct alleg_sort * Strutt() { return _all; } void compila(const TRectype& alleg); diff --git a/cg/cg3301.cpp b/cg/cg3301.cpp index 5c8400e84..2c98bdd22 100755 --- a/cg/cg3301.cpp +++ b/cg/cg3301.cpp @@ -35,17 +35,12 @@ SortRecord::~SortRecord() } const char* SortRecord::decodifica_desc_att (const TString& codatt) - -{ - return cache().get("%AIS", codatt, "S0"); -} +{ return cache().get("%AIS", codatt, "S0"); } const TRectype & SortRecord::look_com(const char * cod) { - TString16 key; - - key.format("|%s", cod); - + TString8 key; + key << '|' << cod; return cache().get(LF_COMUNI, key); } @@ -57,12 +52,11 @@ const TRectype & SortRecord::look_com(const char * cod) // // Ritorna la ragione sociale oppure NULL // -const char * SortRecord::fill_dati_dettaglio (const char * tipocf, long codcf) +const char * SortRecord::fill_dati_dettaglio (char tipocf, long codcf) { - TString16 key; - - key.format("%s|%ld", tipocf, codcf); - const TRectype & clifo = cache().get(LF_CLIFO, key); + TString8 key; + key << tipocf << '|' << codcf; + const TRectype& clifo = cache().get(LF_CLIFO, key); if (!clifo.empty()) { @@ -202,17 +196,15 @@ void SortRecord::azzera_struttura() // void SortRecord::compila(const TRectype& alleg) { - TString tipoa; - long codcf; - // azzera_struttura(); - tipoa = alleg.get (ALL_TIPOCF); - strcpy (_all->tipopers_dett, tipoa); + const char tipoa = alleg.get_char(ALL_TIPOCF); + _all->tipopers_dett[0] = tipoa; + _all->tipopers_dett[1] = '\0' // strcpy (_all->tipopers_dett, _alleg->curr().get (ALL_TIPOCF)); - codcf = alleg.get_long (ALL_CODCF); + const long codcf = alleg.get_long (ALL_CODCF); _all->codcf_dett = codcf; // _RecordSort->Strutt()->codcf_dett = _alleg->curr().get_long (ALL_CODCF);