diff --git a/src/ReportBase/_Bibliography.py b/src/ReportBase/_Bibliography.py index 32f7fe4e5..6a7bf91cc 100644 --- a/src/ReportBase/_Bibliography.py +++ b/src/ReportBase/_Bibliography.py @@ -223,7 +223,7 @@ class Bibliography(object): if ( self.mode & self.MODE_DATE ) == self.MODE_DATE: date1 = source_ref1.get_date_object() date2 = source_ref2.get_date_object() - if date1.is_equal(date2): + if not date1.is_equal(date2): return False if ( self.mode & self.MODE_CONF ) == self.MODE_CONF: conf1 = source_ref1.get_confidence_level() diff --git a/src/ReportBase/_Endnotes.py b/src/ReportBase/_Endnotes.py index fa8084c09..1c35363b7 100644 --- a/src/ReportBase/_Endnotes.py +++ b/src/ReportBase/_Endnotes.py @@ -129,7 +129,17 @@ def write_endnotes(bibliography, database, doc, printnotes=False): first = True reflines = "" for key, ref in ref_list: - txt = "%s: %s" % (key, ref.get_page()) + datepresent = False + date = ref.get_date_object() + if date is not None and not date.is_empty(): + datepresent = True + if datepresent: + if ref.get_page(): + txt = "%s: %s - %s" % (key, ref.get_page(), str(date)) + else: + txt = "%s: %s" % (key, str(date)) + else: + txt = "%s: %s" % (key, ref.get_page()) if first: reflines += txt first = False