diff --git a/at/at7200.cpp b/at/at7200.cpp index 13a2f6661..8b870b9ae 100755 --- a/at/at7200.cpp +++ b/at/at7200.cpp @@ -96,10 +96,10 @@ bool TPrimaDon::user_create() bool TPrimaDon::user_destroy() { - delete _msk; - delete _rel; - delete _donaz; delete _sdonazioni; + delete _donaz; + delete _rel; + delete _msk; return TRUE; } diff --git a/at/at7300.cpp b/at/at7300.cpp index bccbf6e44..b0e9a4796 100755 --- a/at/at7300.cpp +++ b/at/at7300.cpp @@ -135,12 +135,12 @@ bool TBologna90::user_create() bool TBologna90::user_destroy() { - delete _msk; - delete _rel; - delete _scontrolli; - delete _contsan; delete _sidoneita; delete _idoneita; + delete _scontrolli; + delete _contsan; + delete _rel; + delete _msk; return TRUE; } diff --git a/at/at7500.cpp b/at/at7500.cpp index f69e023f9..e946afe74 100755 --- a/at/at7500.cpp +++ b/at/at7500.cpp @@ -162,12 +162,12 @@ bool TAggiornaDon::user_create() bool TAggiornaDon::user_destroy() { - delete _msk; - delete _rel; - delete _donaz; - delete _storico; - delete _sdonazioni; delete _sstorico; + delete _sdonazioni; + delete _storico; + delete _donaz; + delete _rel; + delete _msk; return TRUE; } diff --git a/at/at7600.cpp b/at/at7600.cpp index f164790e7..d387679c0 100755 --- a/at/at7600.cpp +++ b/at/at7600.cpp @@ -71,7 +71,8 @@ bool TRiordinaControlli::preprocess_page(int file, int counter) keyi->put(IDO_CODICE, codice); int erri = _sidoneita->read(keyi); - if ((err == NOERR || erri == NOERR) && (_scontrolli->rows() > 0 || _sidoneita->rows() > 0)) + //if ((err == NOERR || erri == NOERR) && (_scontrolli->rows() > 0 || _sidoneita->rows() > 0)) + if (err == NOERR || erri == NOERR) { con_reord(recsog,_scontrolli, _sidoneita); rewrite = TRUE; @@ -106,11 +107,16 @@ bool TRiordinaControlli::set_print(int) a.put(SOG_CODICE, codfin); _cur = add_cursor(new TCursor(_rel,"", 1, &da, &a)); } - else + else { - _cur = add_cursor(new TCursor(_rel,"", 3)); + _cur = add_cursor(new TCursor(_rel,"", 3)); filtra_sezioni(); - } + } + TString256 filtro = ""; + //filtro = "(90->STATO==\"ID\") && ((90->STATOSI==\"SO\") || (90->STATOAF==\"SO\"))"; + filtro = "(90->CATDON==\"01\") || (90->CATDON==\"04\") || (90->CATDON==\"07\")"; + current_cursor()->setfilter((const char*) filtro, TRUE); + reset_files(); add_file(LF_SOGGETTI); reset_print(); @@ -134,12 +140,12 @@ bool TRiordinaControlli::user_create() bool TRiordinaControlli::user_destroy() { - delete _msk; - delete _rel; - delete _scontrolli; - delete _contsan; delete _sidoneita; delete _idoneita; + delete _scontrolli; + delete _contsan; + delete _rel; + delete _msk; return TRUE; } diff --git a/at/at7700.cpp b/at/at7700.cpp index 159d7df72..7d0abfae2 100755 --- a/at/at7700.cpp +++ b/at/at7700.cpp @@ -118,12 +118,12 @@ bool TProblemiStato::user_create() bool TProblemiStato::user_destroy() { + delete _sdonazioni; + delete _scontrolli; + delete _donaz; + delete _contsan; delete _rel; delete _msk; - delete _contsan; - delete _donaz; - delete _scontrolli; - delete _sdonazioni; return TRUE; } diff --git a/at/at7800.cpp b/at/at7800.cpp index 3a14f3957..925ec5703 100755 --- a/at/at7800.cpp +++ b/at/at7800.cpp @@ -224,12 +224,12 @@ bool TRiminiRO_app::user_create() bool TRiminiRO_app::user_destroy() { - delete _rel; - delete _msk; - delete _scontrolli; - delete _contsan; delete _sidoneita; delete _idoneita; + delete _scontrolli; + delete _contsan; + delete _rel; + delete _msk; return TRUE; } diff --git a/at/at7900.cpp b/at/at7900.cpp index 9f798556b..0968f1795 100755 --- a/at/at7900.cpp +++ b/at/at7900.cpp @@ -94,10 +94,10 @@ bool TUltimaDon::user_create() bool TUltimaDon::user_destroy() { - delete _msk; - delete _rel; - delete _donaz; delete _sdonazioni; + delete _donaz; + delete _rel; + delete _msk; return TRUE; }