diff --git a/cg/cg1500.cpp b/cg/cg1500.cpp index 1f2708366..caf89bc94 100755 --- a/cg/cg1500.cpp +++ b/cg/cg1500.cpp @@ -2862,7 +2862,7 @@ const char* CG1500_application::DescrizioneConto(int g, int c, long s, TMP = tc.descrizione(); return TMP; */ - TFixed_string ragsoc(&__tmp_string[256], 50); + TString80 ragsoc; const char* desc = NULL; TLocalisamfile pconti(LF_PCON,FALSE); TLocalisamfile clifo (LF_CLIFO); diff --git a/cg/cg1700.cpp b/cg/cg1700.cpp index 8cf16925f..1a28665c5 100755 --- a/cg/cg1700.cpp +++ b/cg/cg1700.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #include "cg1.h" #include "cg1700.h" @@ -175,7 +176,10 @@ bool CG1700_application::preprocess_page(int file,int count) TString cau_descr, rcau_descr; TString cau_reg (3); bool cau_alleg, cau_rfatt, cau_intra, cau_val; - + int rcau_gruppo, rcau_conto; + long rcau_sottoconto; + char rcau_tipocf; + reset_print(); switch (file) { @@ -210,7 +214,15 @@ bool CG1700_application::preprocess_page(int file,int count) set_row(1, "@130g@f", FLD(LF_CAUSALI,CAU_RITFATT)); break; case LF_RCAUSALI: - rcau_descr = current_cursor()->file(LF_RCAUSALI).get(RCA_DESC); + { + //rcau_descr = current_cursor()->file(LF_RCAUSALI).get(RCA_DESC); + rcau_gruppo = current_cursor()->file(LF_RCAUSALI).get_int(RCA_GRUPPO); + rcau_conto = current_cursor()->file(LF_RCAUSALI).get_int(RCA_CONTO); + rcau_sottoconto = current_cursor()->file(LF_RCAUSALI).get_long(RCA_SOTTOCONTO); + rcau_tipocf = current_cursor()->file(LF_RCAUSALI).get_char(RCA_TIPOCF); + TConto tc (rcau_gruppo,rcau_conto,rcau_sottoconto,rcau_tipocf); + //rcau_tipocf = tc.tipo(); + rcau_descr = tc.descrizione(); *_descr_conto = (const char*) rcau_descr; setta_righe_descr(_descr_conto,conto); set_row (1, "@35g@3n", FLD(LF_RCAUSALI,RCA_GRUPPO)); @@ -219,6 +231,7 @@ bool CG1700_application::preprocess_page(int file,int count) set_row (1, "@51g@1s", FLD(LF_RCAUSALI,RCA_SEZIONE)); set_row (1, "@80g@3s", FLD(LF_RCAUSALI,RCA_CODDESC)); break; + } default: break; } diff --git a/cg/cg3400a.uml b/cg/cg3400a.uml index e19a1a7cc..64d4dec0a 100755 --- a/cg/cg3400a.uml +++ b/cg/cg3400a.uml @@ -6,19 +6,20 @@ STRING CODREG 3 BEGIN PROMPT 1 1 "Codice registro " USE REG SELECT (I0 = 5) || (I0 = 4) - INPUT CODTAB[1,4] ANNO_ESER +// INPUT CODTAB[1,4] ANNO_ESER INPUT CODTAB[5,7] CODREG DISPLAY "Anno" CODTAB[1,4] DISPLAY "Codice" CODTAB[5,7] DISPLAY "Descrizione@50" S0 DISPLAY "Tipo" I0 -// OUTPUT ANNO_ESER CODTAB[1,4] + OUTPUT ANNO_ESER CODTAB[1,4] OUTPUT CODREG CODTAB[5,7] OUTPUT REG_DESC S0 OUTPUT PAGINA_DA I1 // OUTPUT DATA_DA D0 // OUTPUT DATA_A D1 - CHECKTYPE NORMAL +// CHECKTYPE NORMAL + WARNING "Registro inesistente" FLAGS "U" END @@ -33,7 +34,7 @@ BEGIN DISPLAY "Data scarico" D2 OUTPUT ANNO_ESER CODTAB // CHECKTYPE REQUIRED - FLAGS "HZ" + FLAGS "ZH" END STRING REG_DESC 50