From 218e3d585c2f277d66e225c8ddbba0965556f705 Mon Sep 17 00:00:00 2001 From: Brian Matherly Date: Sat, 5 Jan 2008 21:41:38 +0000 Subject: [PATCH] 0001505: Verifying database signals dead father, when he is not a father. (Patch from Raphael Ackermann ) svn: r9715 --- ChangeLog | 5 +++++ src/plugins/Verify.py | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7c2fb841c..81f101009 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-01-05 Raphael Ackermann + * src/src/plugins/Verify.py: + Patch from Raphael Ackermann + Fix 0001505: Verifying database signals dead father, when he is not a father. + 2008-01-05 Brian Matherly * src/ReportBase/_ReportDialog.py: * src/ReportBase/_BareReportDialog.py: diff --git a/src/plugins/Verify.py b/src/plugins/Verify.py index b7c0ddd2d..f4fd27c2b 100644 --- a/src/plugins/Verify.py +++ b/src/plugins/Verify.py @@ -1404,13 +1404,19 @@ class DeadParent(FamilyRule): child_birth_date_ok = child_birth_date > 0 if not child_birth_date_ok: continue - father_broken = (father_death_date_ok + + hasBirthRelToMother = child_ref.mrel == gen.lib.ChildRefType.BIRTH + hasBirthRelToFather = child_ref.frel == gen.lib.ChildRefType.BIRTH + + father_broken = (hasBirthRelToFather + and father_death_date_ok and ((father_death_date + 294) < child_birth_date)) if father_broken: self.get_message = self.father_message return True - mother_broken = (mother_death_date_ok + mother_broken = (hasBirthRelToMother + and mother_death_date_ok and (mother_death_date < child_birth_date)) if mother_broken: self.get_message = self.mother_message