Patch level :10.0

Files correlati     :
Ricompilazione Demo : [ ]
Commento            :


git-svn-id: svn://10.65.10.50/trunk@18312 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2009-02-23 11:27:32 +00:00
parent 7b3f50d2b9
commit 91dde34dcf
2 changed files with 18 additions and 22 deletions

View File

@ -446,16 +446,16 @@ bool TMovanal_msk::on_field_event(TOperable_field& o, TField_event e, long jolly
__codcms << s.row(r).get(s.cid2index(j));
}
if (e == se_notify_modify)
{
if (_cms_start > 0 && _cdc_start > 0)
{
const int r = int(jolly);
TSheet_field & s = sfield(F_RIGHE);
TMask & m = s.sheet_mask();
if (_cms_start > 0)
{
const TRectype & curr = ((TEdit_field &) m.field(_cms_start)).browse()->cursor()->curr();
const TString & codcms = curr.get(COMMESSE_CODCMS);
if ((_cdc_start > 0)&&(__codcms != codcms))
if (__codcms != codcms)
{
const TString codcosto = curr.get(COMMESSE_CODCOSTO);
for (short i = _cdc_start; i <= _cdc_end; i++)

View File

@ -1265,10 +1265,7 @@ void TAnal_mov::saldo_set_reset(const TRectype& row, bool reset)
annies.add(esc_iniziale);
const char tipomov = get_char(MOVANA_TIPOMOV);
// se e' un movimento di tipo preventivo potrebbe avere una data di scadenza come la mozzarella
// ora tutti
// if (tipomov == 'P' || tipomov == 'V')
// {
// i movimenti analitici possono avere una data di scadenza come la mozzarella
const TDate datacomp = get_date(MOVANA_DATACOMP);
const TDate datafcomp = get_date(MOVANA_DATAFCOMP);
if (datafcomp.ok() && datafcomp > datacomp)
@ -1283,7 +1280,6 @@ void TAnal_mov::saldo_set_reset(const TRectype& row, bool reset)
annies.add(a);
}
}
// }
TToken_string key;
key.add(tipomov);