root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 10.0

Browse Source 
Files correlati     : ba0.exe ba3.exe
Ricompilazione Demo : [ ]
Commento            :
Corretta gestione iterlinea nelle opzioni personalizzate dell'utente


git-svn-id: svn://10.65.10.50/branches/R_10_00@21494 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2011-01-21 11:46:43 +00:00
parent c9d606e462
commit a2c2215507
2 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ba/ba0100.cpp
View File

@ -730,7 +730,7 @@ void TColor_mask::options2mask()
pf.freeze(false);
set(216, _color.get_int("TreeView"));
set(217, _color.get_int("Interline"));
set(217, _color.get_int("InterLine"));
const int sz = _color.get_int("ToolSize");
set(218, (sz-16)/8);
enable_options();
@ -755,7 +755,7 @@ void TColor_mask::mask2options()
_color.add("TreeView", val, true);
val.cut(0) << get_int(217);
_color.add("Interline", val, true);
_color.add("InterLine", val, true);
val.cut(0) << (16+get_int(218)*8);
_color.add("ToolSize", val, true);

33
ba/ba3100.cpp
View File

@ -137,26 +137,24 @@ void TGeneric_table_app::init_insert_mode(TMask& m)
const TString& n = get_tabname();
if (n == TAB_REGISTRI)
{
const long ditta = get_firm();
const int anno = m.get_int(F_ANNO);
m.set(F_STAMPA_INTESTAZIONE, _stampa_intest ? "X" : "");
TTable reg(TAB_REGISTRI);
reg.put("CODTAB", m.get(F_ANNO));
const TRectype to(reg.curr());
TTable reg(TAB_REGISTRI);
reg.put("CODTAB", m.get(F_ANNO));
_exist_journal = false;
_exist_dich_int = false;
const TRectype to(reg.curr());
_exist_journal = FALSE;
_exist_dich_int = FALSE;
for (reg.read(_isgteq); !_exist_journal && reg.good() && reg.curr() <= to; reg.next())
_exist_journal = (reg.get_long("I0") == REG_JOURNAL);
reg.zero();
reg.put("CODTAB", m.get(F_ANNO));
for (reg.read(_isgteq); !_exist_dich_int && reg.good() && reg.curr() <= to; reg.next())
_exist_dich_int = (reg.get_long("I0") == REG_DICHINT);
// PIG programming mode
for (reg.read(_isgteq); !_exist_journal && reg.good() && reg.curr() <= to; reg.next())
_exist_journal = (reg.get_long("I0") == REG_JOURNAL);
reg.zero();
reg.put("CODTAB", m.get(F_ANNO));
for (reg.read(_isgteq); !_exist_dich_int && reg.good() && reg.curr() <= to; reg.next())
_exist_dich_int = (reg.get_long("I0") == REG_DICHINT);
}
else
if (n == TAB_VERSAMENTI)
@ -573,7 +571,7 @@ bool TGeneric_table_app::codmag_handler(TMask_field& f, KEY k)
TMask& m = f.mask();
if (m.query_mode() && k == K_ENTER)
{
const TString& codice = m.get(f.dlg()); //stringa immessa nella maschera
const TString& codice = f.get(); //stringa immessa nella maschera
const TString& codtab = cache().get("MAG", codice, "CODTAB"); //stringa cercata nella tabella
if (codtab.empty()) //se non trovi la stringa in tabella (in codice magazzino non esiste->se in insert mode)
{
@ -582,7 +580,7 @@ bool TGeneric_table_app::codmag_handler(TMask_field& f, KEY k)
return f.error_box("Il codice magazzino deve avere obbligatoriamente lunghezza 3");
}
}
return TRUE;
return true;
}
bool TGeneric_table_app::codnoc_handler(TMask_field& f, KEY k)
@ -602,8 +600,7 @@ bool TGeneric_table_app::numivd_handler(TMask_field& f, KEY k)
{
if (f.to_check(k))
{
const TString & val = f.get();
const TString& val = f.get();
if (val.not_empty())
{
if (!isdigit(val[0]) || !isdigit(val[1]))