diff --git a/src/sc/scselect.cpp b/src/sc/scselect.cpp index 5f951480a..8842d48d8 100755 --- a/src/sc/scselect.cpp +++ b/src/sc/scselect.cpp @@ -67,9 +67,8 @@ TSelection_mask::TSelection_mask(const char* name) _cli_sh_k1 = new TCursor_sheet(_cli_cur_k1, " |CODCF|RAGSOC|PAIV", TR("Selezione cliente per codice"), "@1|Codice|Ragione Sociale@50",0,1); - _cli_sh_k2 = new TCursor_sheet(_cli_cur_k2, " |RAGSOC|CODCF", "Selezione clienti per ragione sociale", + _cli_sh_k2 = new TCursor_sheet(_cli_cur_k2, " |RAGSOC|CODCF", "Selezione cliente per ragione sociale", "@1|Ragione Sociale@50|Codice",0,1); - _cli_sh_k2->add_checkbutton(SC_CLIFO+500, 0, "", 68, 0, 2, 1, "", 10112, 10113).set_handler(sc_filter_handler); if (id2pos(SC_CLIFO) >= 0) @@ -495,7 +494,8 @@ bool TSelection_mask::fdfrom_handler(TMask_field& f, KEY k) const TString& value = f.get(); c.cursor()->curr().put(fld, value); c.cursor()->read(); - c.set(SC_CLIFO, value, 0x3); + if(c.find_by_id(SC_CLIFO) != NULL) + c.set(SC_CLIFO, value, 0x3); c.disable_check(); c.disable(DLG_USER); if (c.run() == K_ENTER) @@ -531,7 +531,8 @@ bool TSelection_mask::fdto_handler(TMask_field& f, KEY k) const TString& value = f.get(); c.cursor()->curr().put(fld, value); c.cursor()->read(); - c.set(SC_CLIFO, value, 0x3); + if (c.find_by_id(SC_CLIFO) != NULL) + c.set(SC_CLIFO, value, 0x3); c.disable_check(); c.disable(DLG_USER); if (c.run() == K_ENTER)