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

Patch level : 10.0 224

Browse Source 
Files correlati     : ca2.exe
Ricompilazione Demo : [ ]
Commento            :

Utilizzata la data di fine competenza anche per i movimenti normali.
Corretto errore sull' handler dello sheet, accedeva alla commessa anche se non cofigurata


git-svn-id: svn://10.65.10.50/trunk@18228 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2009-02-10 01:35:24 +00:00
parent baa7727c09
commit eb018fbe11
3 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ca/ca2100.cpp
View File

@ -441,6 +441,7 @@ bool TMovanal_msk::on_field_event(TOperable_field& o, TField_event e, long jolly
const int r = int(jolly); const int r = int(jolly);
__codcms.cut(0); __codcms.cut(0);
if (_cms_start > 0)
for (short j = _cms_start; j <= _cms_end; j++) for (short j = _cms_start; j <= _cms_end; j++)
__codcms << s.row(r).get(s.cid2index(j)); __codcms << s.row(r).get(s.cid2index(j));
} }
@ -449,10 +450,12 @@ bool TMovanal_msk::on_field_event(TOperable_field& o, TField_event e, long jolly
const int r = int(jolly); const int r = int(jolly);
TSheet_field & s = sfield(F_RIGHE); TSheet_field & s = sfield(F_RIGHE);
TMask & m = s.sheet_mask(); TMask & m = s.sheet_mask();
if (_cms_start > 0)
{
const TRectype & curr = ((TEdit_field &) m.field(_cms_start)).browse()->cursor()->curr(); const TRectype & curr = ((TEdit_field &) m.field(_cms_start)).browse()->cursor()->curr();
const TString & codcms = curr.get(COMMESSE_CODCMS); const TString & codcms = curr.get(COMMESSE_CODCMS);
if ((_cms_start > 0)&&(_cdc_start > 0)&&(__codcms != codcms)) if ((_cdc_start > 0)&&(__codcms != codcms))
{ {
const TString codcosto = curr.get(COMMESSE_CODCOSTO); const TString codcosto = curr.get(COMMESSE_CODCOSTO);
for (short i = _cdc_start; i <= _cdc_end; i++) for (short i = _cdc_start; i <= _cdc_end; i++)
@ -472,6 +475,7 @@ bool TMovanal_msk::on_field_event(TOperable_field& o, TField_event e, long jolly
} }
} }
} }
}
if (e == fe_close) if (e == fe_close)
{ {
const TImporto totdoc(get(F_SEZIONE)[0], get_real(F_TOTDOC)); const TImporto totdoc(get(F_SEZIONE)[0], get_real(F_TOTDOC));

6
ca/ca2100a.uml
View File

@ -37,9 +37,9 @@ END
LIST F_TIPO 1 25 LIST F_TIPO 1 25
BEGIN BEGIN
PROMPT 2 5 "Tipo movimento " PROMPT 2 5 "Tipo movimento "
ITEM " |Normale" MESSAGE RESET,F_DATAFCOMP|HIDE,F_DATAFCOMP ITEM " |Normale"
ITEM "P|Preventivo" MESSAGE SHOW,F_DATAFCOMP ITEM "P|Preventivo"
ITEM "V|Variazione preventivo" MESSAGE SHOW,F_DATAFCOMP ITEM "V|Variazione preventivo"
FIELD TIPOMOV FIELD TIPOMOV
END END

7
ca/calib01.cpp
View File

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