From fcddf484842ef09bd22f4c6ada5a495521d5edf1 Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 23 Sep 2005 08:46:35 +0000 Subject: [PATCH] Patch level : 2.2 182 Files correlati : ci0.exe Ricompilazione Demo : [ ] Commento : MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- ci/ci0400.cpp | 7 ++++++- ci/ci1200.cpp | 2 +- ci/cilib.cpp | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ci/ci0400.cpp b/ci/ci0400.cpp index f00acf7fd..e9a5357f9 100755 --- a/ci/ci0400.cpp +++ b/ci/ci0400.cpp @@ -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); } diff --git a/ci/ci1200.cpp b/ci/ci1200.cpp index e4a583c84..eb8ec0b9c 100755 --- a/ci/ci1200.cpp +++ b/ci/ci1200.cpp @@ -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 diff --git a/ci/cilib.cpp b/ci/cilib.cpp index 8520849c0..046cfcb39 100755 --- a/ci/cilib.cpp +++ b/ci/cilib.cpp @@ -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;