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

Patch level : 12.00 1284

Browse Source 
Files correlati     : ve0.exe ve2.exe ve2400.msk

Commento            :

Non era possibile svuotare una riga conai suglii articoli
Se le svuotavo tutte ricaricava i vvalori di prima della conversione
Il calcolo CONAI viene fatto anche se riattivo la registrazione con shift-F12
This commit is contained in:
Alessandro Bonazzi 2023-10-04 17:20:57 +02:00
parent 2ccae253fc
commit b2580dbf79
5 changed files with 44 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/include/defmask.h
View File

@ -123,6 +123,7 @@
#define SCONTO_FUNC 23 0
#define CHECK_IBAN_FUNC 24 10
#define CHECK_BBAN_FUNC 25 5
#define NOT_EMPTY_CHECK_TARGET 21 1
#define VALEXPR VALIDATE EXPR_FUNC
#define NUM_EXPR VALEXPR 0

2
src/include/doc.h
View File

@ -74,7 +74,6 @@
#define DOC_G1 "G1"
#define DOC_DATAAGG "DATAAGG"
#define DOC_UTENTE "UTENTE"
#define DOC_COLL_GOLEM "COLL_GOLEM"
#define DOC_DOCEVASO "DOCEVASO"
#define DOC_CONTROEURO "CONTROEURO"
#define DOC_CODCMS "CODCMS"
@ -114,7 +113,6 @@
#define DOC_DATAINIRIF "DATAINIRIF"
#define DOC_DATAFINRIF "DATAFINRIF"
// modulo pe
#define DOC_SPESEUPD "SPESEUPD"
#define DOC_USEK "USEK"

2
src/include/maskfld.cpp
View File

@ -4082,6 +4082,8 @@ bool TList_field::on_key(KEY key)
{
if (has_warning())
return error_box(get_warning());
else
return false;
}
}
}

2
src/include/relation.h
View File

@ -409,7 +409,7 @@ public:
{ _filter_update = update; _filter_limit = limit; filter(filter_expr); }
// @cmember Setta la regione-filtro dal record <p from> al record <p to>
void setregion(const TRectype& from, const TRectype& to, int tilde = 0x0)
{ filter(NULL,&from, &to, tilde); }
{ filter(nullptr, &from, &to, tilde); }
// @cmember Ritorna la relazione del cursore
TRelation* relation() const

36
src/include/validate.cpp
View File

@ -711,10 +711,35 @@ HIDDEN bool _alpha_val(TMask_field& f, KEY k)
HIDDEN bool _not_empty_chkfld_val(TMask_field& f, KEY k)
{
bool ok = true;
if (f.to_check(k,true) && f.get().not_empty())
const int nparms = get_val_param_count();
const int fldid = nparms > 0 ? get_int_val_param(0) : THIS_FIELD;
bool check = f.to_check(k, true);
if (!check && fldid != THIS_FIELD)
check = f.mask().efield(fldid).to_check(k, true);
if (check && f.get().not_empty())
{
if (fldid == THIS_FIELD)
{
TBrowse * b = ((TEdit_field&)f).browse();
if (b != NULL) ok = b->check(k == K_TAB ? RUNNING_CHECK : FINAL_CHECK);
if (b != NULL)
ok = b->check(k == K_TAB ? RUNNING_CHECK : FINAL_CHECK);
}
else
{
TEdit_field & chkfld = f.mask().efield(fldid);
TBrowse * b = chkfld.browse();
if (b != NULL)
{
CheckType c = chkfld.check_type();
chkfld.check_type(CHECK_REQUIRED);
ok = b->check(k == K_TAB ? RUNNING_CHECK : FINAL_CHECK);
chkfld.check_type(c);
}
}
}
return ok;
}
@ -957,11 +982,11 @@ HIDDEN bool _iban_val(TMask_field& f, KEY key)
id[i] = get_int_val_param(i);
if (nparms < 9)
id[8] = -1;
id[8] = 0;
if (nparms < 10)
id[9] = 0;
bool pres = get_int_val_param(9);
bool pres = get_int_val_param(9) > 0;
TString80 iban = m.get(id[0]);
TString4 iso, cin, bcin;
@ -977,7 +1002,7 @@ HIDDEN bool _iban_val(TMask_field& f, KEY key)
enable_iban_fields(m, id[3], id[4], id[5], id[6], id[7], id[8], italy, pres);
m.reset(id[0]);
m.reset(id[2]);
if (italy)
if (!italy)
m.reset(id[3]);
else
{
@ -988,6 +1013,7 @@ HIDDEN bool _iban_val(TMask_field& f, KEY key)
m.reset(id[6]);
}
m.reset(id[7]);
if (nparms > 8)
m.reset(id[8]);
}
if (m.is_sheetmask())