diff --git a/at/at6700.cpp b/at/at6700.cpp index ce48a63a9..93c4c23f1 100755 --- a/at/at6700.cpp +++ b/at/at6700.cpp @@ -180,10 +180,10 @@ bool TScadenzeControlli::preprocess_page(int file, int counter) { const TRectype& riga = app()._scontrolli->row(app()._scontrolli->rows()); TDate prossdata = riga.get_date(CON_PROSSDATA); - + TString80 prosstipo = riga.get(CON_PROSSTIPO); TString80 rigastampa; rigastampa = ""; - rigastampa << "@72g"<row(app()._scontrolli->rows()); TString16 prosstipo = riga.get(CON_PROSSTIPO); TDate prossdata = riga.get_date(CON_PROSSDATA); - if (!((prosstipo == app()._tipo1) && (prossdata >= app()._dataini) && (prossdata <= app()._datafin))) - filtrato = FALSE; + if (!((prossdata >= app()._dataini) && (prossdata <= app()._datafin))) + filtrato = FALSE; + if ((app()._tipo1.not_empty()) && (!(prosstipo == app()._tipo1))) + filtrato = FALSE; } else filtrato = FALSE; @@ -368,6 +370,7 @@ bool TScadenzeControlli::set_print(int) _categorie.add((const char*) catses); current_cursor()->set_filterfunction(filter_func_scadenzectrl,TRUE); reset_print(); + printer().footerlen(0); crea_intestazione(); return TRUE; }