diff --git a/cg/cg4400.cpp b/cg/cg4400.cpp index 3c1573a20..722d4064a 100755 --- a/cg/cg4400.cpp +++ b/cg/cg4400.cpp @@ -1915,7 +1915,7 @@ bool CG4400_application::preprocess_page(int file, int counter) printer().formfeed(); _intesta_liq = FALSE; reset_print(); - fremove(t); + remove(t); } } _st_liq[m] = TRUE; @@ -2417,7 +2417,7 @@ void CG4400_application::liq_b0_settato() printer().footerlen(0); merge_export_file(f,FALSE,TRUE); _intesta_liq = FALSE; - fremove(f); + remove(f); } } @@ -2486,7 +2486,7 @@ print_action CG4400_application::postprocess_page (int file, int counter) printer().footerlen(0); merge_export_file(_t,FALSE,TRUE); _intesta_liq = FALSE; - fremove(_t); + remove(_t); } //_t = NULL; Come ho potuto scrivere cio?! } @@ -2740,7 +2740,7 @@ void CG4400_application::no_movimenti() merge_export_file(f,FALSE,TRUE); printer().formfeed(); _intesta_liq = FALSE; - fremove(f); + remove(f); } } } @@ -2796,6 +2796,13 @@ bool CG4400_application::stampa_registri_IVA(const TMask& m) (*_cur) = 0L; //la filter function viene chiamata quando posiziono il cursore const long item = _cur->items(); + // 17.5.95 Leggo parametri di stampa del registro + TString16 config; + const long codditta = get_firm(); + const char* reg = (const char*)_codreg; + config.format("REG%05ld%03s", codditta, reg); + printer().read_configuration(config); + if (item > 0l) { print(); @@ -2900,6 +2907,13 @@ bool CG4400_application::stampa_registri_IVA(const TMask& m) // Vado a vedere se ci sono movimenti (*_cur) = 0L; const long items = _cur->items(); + + // 17.5.95 Leggo parametri di stampa del registro + TString16 config; + const long codditta = get_firm(); + const char* reg = (const char*)_codreg; + config.format("REG%05ld%03s", codditta, reg); + printer().read_configuration(config); if (items > 0l) { @@ -2956,7 +2970,7 @@ void CG4400_application::stampa_liq_mesi_succ() printer().footerlen(0); merge_export_file(t,FALSE,TRUE); _intesta_liq = FALSE; - fremove(t); + remove(t); } } } diff --git a/cg/cg4400.h b/cg/cg4400.h index 733d83986..6ee87c826 100755 --- a/cg/cg4400.h +++ b/cg/cg4400.h @@ -23,7 +23,8 @@ #include #include #include -#include "cglib03.h" +#include "cglib03.h" +#include "cglib04.h" #include "conto.h" enum messaggio { @@ -47,7 +48,8 @@ class CG4400_application : public TPrintapp TBit_array _selected; TArray_sheet *_ditte; TArray _nomiditte; - bool _st_liq[13]; + bool _st_liq[13]; + bool _test; TRecnotype _nrec; bool _mov_empty, _stampa_ind_ditta, _stampa_tutti_i_registri, _auto_intraf, _stampa; bool _corrispettivi, _liquidazione, _riep_liq, _stampa_ind_comp, _esiste_riga_iva, _stampa_cred_pre; @@ -146,7 +148,7 @@ public: virtual print_action postprocess_page (int, int); virtual void preprocess_header(); - CG4400_application() : TPrintapp(), _ditte(NULL), _selected(10000), _nomiditte(100) {} + CG4400_application() : TPrintapp(), _ditte(NULL), _selected(10000), _nomiditte(100), _test(FALSE) {} virtual ~CG4400_application() {} };