Resa non obbligatoria la data limite operazione negli estratti conto

git-svn-id: svn://10.65.10.50/trunk@2613 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 1996-02-19 14:19:41 +00:00
parent 53701e9b1f
commit 84895cda10
3 changed files with 11 additions and 5 deletions

View File

@ -786,8 +786,9 @@ void TEC_form::change_magic_footer(const THash_object& o, TString& s)
val.cut(0);
if (magic1 == "DA")
{
const TDate& d = magic2 == "SC" ? _dls : _dlo;
val = d.string();
const TDate& d = magic2 == "SC" ? _dls : _dlo;
if (d != eotime)
val = d.string();
}
if (magic1 == "VA")
val = o.key();
@ -1105,6 +1106,8 @@ TEC_form::TEC_form(const TEC_mask& m, bool gesval)
_lingua = m.get_prof_lang(); // Lingua profilo
_dlo = m.get(F_DATALIMOP);
if (!_dlo.ok())
_dlo = eotime;
_dls = m.get(F_DATALIMSC);
_giorni_rischio = m.get_int(F_GIORISCH);
_dir = _dls; _dir -= _giorni_rischio;

View File

@ -66,7 +66,7 @@ DATE F_DATALIMOP
BEGIN
PROMPT 1 4 "Data limite operazione "
FLAGS "A"
CHECKTYPE REQUIRED
// CHECKTYPE REQUIRED
END
DATE F_DATALIMSC

View File

@ -652,7 +652,8 @@ void TESSL_form::change_magic_footer(const THash_object& o, TString& s)
if (magic1 == "DA")
{
const TDate& d = magic2 == "SC" ? _dls : _dlo;
val = d.string();
if (d != eotime)
val = d.string();
}
if (magic1 == "VA")
val = o.key();
@ -997,7 +998,9 @@ TESSL_form::TESSL_form(const TESSL_mask& m, bool gesval, short id_datalim, short
TCursor_sheet& cs = m.cur_sheet();
_cursore = cs.cursor();
_dlo = id_datalim > 0 ? TDate(m.get(id_datalim)) : eotime;
_dlo = id_datalim > 0 ? TDate(m.get(id_datalim)) : eotime;
if (!_dlo.ok())
_dlo = eotime;
_dls = id_datascad > 0 ? TDate(m.get(id_datascad)) : eotime;
if (id_giorni_rischio > 0)
_giorni_rischio = m.get_int(id_giorni_rischio);