diff --git a/src/f9/f90100.cpp b/src/f9/f90100.cpp index e38390ebc..60140a74e 100644 --- a/src/f9/f90100.cpp +++ b/src/f9/f90100.cpp @@ -516,7 +516,7 @@ bool TMonitor_mask::on_field_event(TOperable_field& o, TField_event e, long joll fill(); break; case B_SHOWESTR: - open_mostra_estrazione(); + open_apri_estr_win(); break; case B_SHOWESCL: if (e == fe_button) @@ -530,7 +530,7 @@ bool TMonitor_mask::on_field_event(TOperable_field& o, TField_event e, long joll return true; } -void TMonitor_mask::open_mostra_estrazione() +void TMonitor_mask::open_apri_estr_win() { static TString last_fill_id = 0; TString id; @@ -1090,8 +1090,8 @@ void TApri_estr_msk::fill_estr() const sql.cut(0) << "SELECT NUMREG, DATAREG, DATADOC, CODCAUS, TIPODOC, MESELIQ, NUMDOC, TOTDOC, CODCF, REG, PROTIVA, DESCR, ELABF9\n" "FROM MOV\n" - "WHERE REG = '" << fp_db().sq_get(IVA_SEZIVA) << "' AND DATADOC=" << TDate(fp_db().sq_get_date(IVA_DATADOC)).date2ansi() << - " AND PROTIVA = " << fp_db().sq_get(IVA_NPROT); + "WHERE REG = '" << fp_db().sq_get(IVA_SEZIVA) << "' AND DATADOC='" << TDate(fp_db().sq_get_date(IVA_DATADOC)).date2ansi() << "'" + " AND PROTIVA = '" << fp_db().sq_get(IVA_NPROT) << "'"; rec.set(sql); rec.move_first(); TToken_string& r = sf.row(-1); diff --git a/src/f9/f90100.h b/src/f9/f90100.h index fe859ffd9..f592c7018 100644 --- a/src/f9/f90100.h +++ b/src/f9/f90100.h @@ -144,7 +144,7 @@ class TMonitor_mask : public TAutomask // Metodi per la maschera 'Apri Estr.' - void open_mostra_estrazione(); + void open_apri_estr_win(); // Controllo estr. mask void controllo_errori() const;