From 26133e7fd87b75bc84f50dc8e99a6526c6a45ca8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Rapinat?= <romjerome@yahoo.fr>
Date: Wed, 23 Jul 2008 09:11:08 +0000
Subject: [PATCH] #2300: error in baptised_str()'s logic at the end

svn: r10916
---
 src/ReportBase/_ReportUtils.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/ReportBase/_ReportUtils.py b/src/ReportBase/_ReportUtils.py
index 69447d2a2..7dc667ed0 100644
--- a/src/ReportBase/_ReportUtils.py
+++ b/src/ReportBase/_ReportUtils.py
@@ -2531,12 +2531,12 @@ def buried_str(database, person, person_name=None,
             text = buried_full_date_no_place['succinct'] % values
     elif bdate and verbose:
         if bplace: #male, month_year, place
-            text =  buried_partial_date_place[gender][name_index] % values
+            text = buried_partial_date_place[gender][name_index] % values
         else:      #male, month_year, no place
             text = buried_partial_date_no_place[gender][name_index] % values
     elif bdate:
         if bplace: #male, month_year, place
-            text =  buried_partial_date_place['succinct'] % values
+            text = buried_partial_date_place['succinct'] % values
         else:      #male, month_year, no place
             text = buried_partial_date_no_place['succinct'] % values
     elif bplace and verbose:   #male, no date, place
@@ -2636,18 +2636,20 @@ def baptised_str(database, person, person_name=None, verbose=True, empty_date=""
             text = baptised_full_date_no_place['succinct'] % values
     elif bdate and verbose:
         if bplace: #male, month_year, place
-            text =  baptised_partial_date_place[gender][name_index] % values
+            text = baptised_partial_date_place[gender][name_index] % values
         else:      #male, month_year, no place
             text = baptised_partial_date_no_place[gender][name_index] % values
     elif bdate:
         if bplace: #male, month_year, place
-            text =  baptised_partial_date_place['succinct'] % values
-    elif bplace:   #male, no date, place
-        text = baptised_no_date_place['succinct'] % values
-    elif verbose:
+            text = baptised_partial_date_place['succinct'] % values
+        else:      #male, month_year, no place
             text = baptised_partial_date_no_place['succinct'] % values
     elif bplace and verbose:   #male, no date, place
         text = baptised_no_date_place[gender][name_index] % values
+    elif bplace:   #male, no date, place
+        text = baptised_no_date_place['succinct'] % values
+    elif verbose:
+        text = baptised_no_date_no_place[gender][name_index] % values
     else:          #male, no date, no place
         text = baptised_no_date_no_place['succinct'] % values
         
@@ -2655,6 +2657,7 @@ def baptised_str(database, person, person_name=None, verbose=True, empty_date=""
         text = text + " "
     return text
 
+
 #-------------------------------------------------------------------------
 #
 # list_person_str