From 0bff6e09eab99a5c31e93c5a9b4506e4013e22b1 Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 3 Jan 2007 17:17:41 +0000 Subject: [PATCH] Patch level : 4.0 nopatch Files correlati : Ricompilazione Demo : [ ] Commento : git-svn-id: svn://10.65.10.50/trunk@14719 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- cg/cgp1100.cpp | 28 +++++++++++----------------- cg/cgp1200.cpp | 16 ++++++++-------- cg/cgp2100.cpp | 2 +- cg/cgp3100.cpp | 17 +++++------------ 4 files changed, 25 insertions(+), 38 deletions(-) diff --git a/cg/cgp1100.cpp b/cg/cgp1100.cpp index 9e607329e..b12d0e113 100755 --- a/cg/cgp1100.cpp +++ b/cg/cgp1100.cpp @@ -105,7 +105,7 @@ protected: virtual void preprocess_header(); virtual void preprocess_footer(); virtual void set_page(int,int); - virtual void process_link(int id, const char* txt); + virtual bool process_link(int id, const char* txt); void set_handlers(TMask* msk) const; bool mask2sheet(); @@ -198,18 +198,12 @@ int TMastrini_application::righe_rimaste_da_stampare() return righe_rimaste; } -void TMastrini_application::process_link(int id, const char* txt) -{ - const char* const app = "cg2 -0"; - TToken_string ss(10); - ss.add("1"); - ss.add(txt); +bool TMastrini_application::process_link(int id, const char* txt) +{ + TRectype mov(LF_MOV); - TMessage fs(cmd2name(app), MSG_LN, ss); - fs.send(); - - TExternal_app pn(app); - pn.run(); + mov.put(MOV_NUMREG, txt); + return mov.edit(); } bool TMastrini_application::sottoc_handler_ini(TMask_field& f, KEY key) @@ -658,7 +652,7 @@ bool TMastrini_application::almeno_un_record() if (_cdc != 0) { - const long cdc = rmov.get_long(RMV_CDC); + const long cdc = rmov.get_long("NUMGIO"); if (_cdc != cdc) continue; } @@ -1545,7 +1539,7 @@ bool TMastrini_application::preprocess_page(int file, int counter) _g_contr = rmov.get(RMV_GRUPPOC); _c_contr = rmov.get(RMV_CONTOC); _s_contr = rmov.get(RMV_SOTTOCONTOC); - _centrodicosto = rmov.get(RMV_CDC); + _centrodicosto = rmov.get("NUMGIO"); // Se non ha il richiesto numero di centro di costo salta la stampa di questa riga di movimento if (_cdc != 0L && _cdc != atol(_centrodicosto)) @@ -3196,7 +3190,7 @@ void TMastrini_application::calcola_progressivi_al() if (_cdc != 0) { - const long cdc = rmov.get_long(RMV_CDC); + const long cdc = rmov.get_long("NUMGIO"); if (_cdc != cdc) continue; } @@ -3235,7 +3229,7 @@ void TMastrini_application::calcola_cdc_al(real& dare, real& avere) if ((gruppo != _gruppo)||(conto != _conto)||(sottoc != _sottoc)) break; - const long cdc = rmov.get_long(RMV_CDC); + const long cdc = rmov.get_long("NUMGIO"); if (_cdc != cdc) continue; @@ -3293,7 +3287,7 @@ void TMastrini_application::calcola_progressivi() * record */ - TLocalisamfile saldi(LF_SALDI, FALSE); + TLocalisamfile saldi(LF_SALDI); real progdare_attuale,progavere_attuale,progdare_prec,progavere_prec; real saldo,progredare_eseprec,progreavere_eseprec,pdarep,paverep,saldoini_attuale,saldofine_attuale; char salini,salini_attuale,salfine_attuale; diff --git a/cg/cgp1200.cpp b/cg/cgp1200.cpp index e1623939f..6a066b7ba 100755 --- a/cg/cgp1200.cpp +++ b/cg/cgp1200.cpp @@ -121,7 +121,7 @@ bool TCGPSaldo::data_limite_bilancio(int bilancio, int g, int c, long s, const T break; if (_cdc != 0L) - if (rmov.get_long(RMV_NUMGIO) != _cdc) // Filtro per centro di costo + if (rmov.get_long("NUMGIO") != _cdc) // Filtro per centro di costo continue; #ifdef DBG num_rec++; @@ -132,7 +132,7 @@ bool TCGPSaldo::data_limite_bilancio(int bilancio, int g, int c, long s, const T { TString80 msg; msg.format("%ld records at %ld rec/sec", num_rec, long(num_rec/sec)); - xvt_statbar_set(msg); + xvtil_statbar_set(msg); do_events(); } } @@ -206,7 +206,7 @@ bool TCGPSaldo::data_limite_bilancio(int bilancio, int g, int c, long s, const T } #ifdef DBG - xvt_statbar_refresh(); + xvtil_statbar_refresh(); #endif return _movimentato; @@ -427,7 +427,7 @@ int TStampaBilanciCDC_application::date2esc(const TDate& d, int* prevesc) { const TDate ia(esc.get("D0")); // Data inizio esercizio const TDate fa(esc.get("D1")); // Data fine esercizio - const anno = esc.get_int("CODTAB"); + const int anno = esc.get_int("CODTAB"); app()._inizioEs = ia; app()._fineEs = fa; if (d >= ia && d <= fa) @@ -1933,7 +1933,7 @@ bool TStampaBilanciCDC_application::calcola(int g, int c, long s) data = rmov.get_date(RMV_DATAREG); num_reg = rmov.get_long(RMV_NUMREG); - if (_cdc_cod != 0L && _cdc_cod != rmov.get_long(RMV_CDC)) + if (_cdc_cod != 0L && _cdc_cod != rmov.get_long("NUMGIO")) continue; mov.setkey(1); @@ -2422,7 +2422,7 @@ void TStampaBilanciCDC_application::riempi_record(char t,int g,int c,long s, void TStampaBilanciCDC_application::leggi_clifo(const TArray& gccf) { TSaldo sld; - TLocalisamfile saldi(LF_SALDI, FALSE); + TLocalisamfile saldi(LF_SALDI); int g=0, c=0; long codcf=0l; TString80 ragsoc; @@ -3898,7 +3898,7 @@ print_action TStampaBilanciCDC_application::postprocess_page(int file, int count TDate TStampaBilanciCDC_application::UltimaData(int g, int c, long s, int anno) { TDate uldata; - TLocalisamfile saldi(LF_SALDI, FALSE); //il parametro a false permette di usare un record corrente del file saldi differente a quello del file tmp + TLocalisamfile saldi(LF_SALDI); //il parametro a false permette di usare un record corrente del file saldi differente a quello del file tmp saldi.zero(); if (_annoes != 0) @@ -3923,7 +3923,7 @@ const char* TStampaBilanciCDC_application::DescrizioneConto(int g, int c, long s { TString80 ragsoc; const char* desc = NULL; - TLocalisamfile pconti(LF_PCON,FALSE); + TLocalisamfile pconti(LF_PCON); TLocalisamfile clifo (LF_CLIFO); pconti.zero(); diff --git a/cg/cgp2100.cpp b/cg/cgp2100.cpp index 883355f55..8ce8bb874 100755 --- a/cg/cgp2100.cpp +++ b/cg/cgp2100.cpp @@ -241,7 +241,7 @@ void TGenera_ord_bon::add_totaledoc(TConfig *ordbon,int nrigadoc,const char * ti ordbon->set_paragraph(format("%d,%d",LF_RIGHEDOC, nrigadoc)); ordbon->set(RDOC_TIPORIGA,tiporiga); ordbon->set(RDOC_CODART,codspesa); - ordbon->set(RDOC_PREZZO,importo); + ordbon->set(RDOC_PREZZO, importo.string()); ordbon->set(RDOC_DESCR,"Totale"); } diff --git a/cg/cgp3100.cpp b/cg/cgp3100.cpp index 2686ed197..e4b8b401f 100755 --- a/cg/cgp3100.cpp +++ b/cg/cgp3100.cpp @@ -110,7 +110,7 @@ protected: virtual void preprocess_header(); virtual void preprocess_footer(); virtual void set_page(int,int); - virtual void process_link(int id, const char* txt); + virtual bool process_link(int id, const char* txt); void set_handlers(TMask* msk) const; bool mask2sheet(); @@ -214,18 +214,11 @@ int TMastrini_application::righe_rimaste_da_stampare() return righe_rimaste; } -void TMastrini_application::process_link(int id, const char* txt) +bool TMastrini_application::process_link(int id, const char* txt) { - const char* const app = "cg2 -0"; - TToken_string ss(10); - ss.add("1"); - ss.add(txt); - - TMessage fs(cmd2name(app), MSG_LN, ss); - fs.send(); - - TExternal_app pn(app); - pn.run(); + TRectype mov(LF_MOV); + mov.put(MOV_NUMREG, txt); + return mov.edit(); } bool TMastrini_application::gruppo_hnd (TMask_field& f, KEY k)