Patch level : 2.2 182

Files correlati     : ci0.exe
Ricompilazione Demo : [ ]
Commento            :

Bug 0000458

Se il primo del mese è un lunedi' il disegno non è corretto


git-svn-id: svn://10.65.10.50/trunk@13364 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2005-09-23 08:46:35 +00:00
parent 3e894a6070
commit fcddf48484
3 changed files with 8 additions and 3 deletions

View File

@ -84,7 +84,12 @@ void TImmissioneDocumenti_app::init_flags()
TBit_array & fl = (TBit_array&) m.flags()[i];
TDate caput_anni(1, 1, _year);
for (cursor = 0; cursor.pos() < items; ++cursor)
fl.set(relation.lfile().get_date(DOC_DATADOC) - caput_anni, 1);
{
const TDate datadoc = relation.lfile().get_date(DOC_DATADOC);
if (datadoc.year() == caput_anni.year())
fl.set(relation.lfile().get_date(DOC_DATADOC) - caput_anni, 1);
}
caput_anni += fl.last_one();
m.almanac(i).set_insert_date(m.ordered()[i] ? caput_anni : botime);
}

View File

@ -57,7 +57,7 @@ void TRiepiloghi_mask::create_sheet()
const TMultilevel_code_info& fasinfo = ca_multilevel_code_info(LF_FASI);
TConfig_anal ini;
TConfig & ini = ca_config();
int y = 1;
short dlg = S_CDC1 + 100; // id del primo campo da generare

View File

@ -244,7 +244,7 @@ void TAlmanac_window::update()
do
{
if ((++cdate).wday()==1) row++;
if ((++cdate).wday()==1 && cdate.day() > 1) row++;
col_b = NORMAL_BACK_COLOR;
col_f=NORMAL_COLOR;