From 6a35246e0854b3f5a0f92b53f5bd7492cc2f08b6 Mon Sep 17 00:00:00 2001 From: Paul Culley Date: Mon, 15 May 2017 19:08:25 -0500 Subject: [PATCH] bug 6664; fix Detailed Descendent Report, multi paths to descendent (#386) where the descendent ends up in different generations at the same time --- .../plugins/textreport/detdescendantreport.py | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/gramps/plugins/textreport/detdescendantreport.py b/gramps/plugins/textreport/detdescendantreport.py index 7b0358065..f193e8dee 100644 --- a/gramps/plugins/textreport/detdescendantreport.py +++ b/gramps/plugins/textreport/detdescendantreport.py @@ -106,8 +106,6 @@ class DetDescendantReport(Report): repplace - Whether to replace missing Places with ___________. repdate - Whether to replace missing Dates with ___________. computeage - Whether to compute age. - omitda - Whether to omit duplicate ancestors - (e.g. when distant cousins marry). verbose - Whether to use complete sentences. numbering - The descendancy numbering system to be utilized. desref - Whether to add descendant references in child list. @@ -162,7 +160,6 @@ class DetDescendantReport(Report): blankplace = get_value('repplace') blankdate = get_value('repdate') self.calcageflag = get_value('computeage') - self.dubperson = get_value('omitda') self.verbose = get_value('verbose') self.numbering = get_value('numbering') self.childref = get_value('desref') @@ -447,19 +444,6 @@ class DetDescendantReport(Report): if self.inc_paths: self.write_path(person) - if self.dubperson: - # Check for duplicate record (result of distant cousins marrying) - for dkey in sorted(self.map): - if dkey >= key: - break - if self.map[key] == self.map[dkey]: - self.doc.write_text( - self._("%(name)s is the same person as [%(id_str)s]." - ) % {'name' : '', - 'id_str' : self.dnumber[self.map[dkey]]}) - self.doc.end_paragraph() - return - self.doc.end_paragraph() self.write_person_info(person) @@ -1015,6 +999,7 @@ class DetDescendantOptions(MenuReportOptions): self.__pid.set_help(_("The center person for the report")) add_option("pid", self.__pid) + numbering = EnumeratedListOption(_("Numbering system"), "Henry") numbering.set_items([ ("Henry", _("Henry numbering")), @@ -1081,10 +1066,6 @@ class DetDescendantOptions(MenuReportOptions): computeage.set_help(_("Whether to compute a person's age at death.")) add_option("computeage", computeage) - omitda = BooleanOption(_("Omit duplicate ancestors"), True) - omitda.set_help(_("Whether to omit duplicate ancestors.")) - add_option("omitda", omitda) - usecall = BooleanOption(_("Use callname for common name"), False) usecall.set_help(_("Whether to use the call name as the first name.")) add_option("usecall", usecall)