2007-07-29 Don Allingham <don@gramps-project.org>
* src/Merge/_MergePerson.py (MergePeople.copy_note): convert to the new notelist format (#0001130) svn: r8789
This commit is contained in:
		@@ -1,3 +1,7 @@
 | 
			
		||||
2007-07-29  Don Allingham  <don@gramps-project.org>
 | 
			
		||||
	* src/Merge/_MergePerson.py (MergePeople.copy_note): convert to the
 | 
			
		||||
	new notelist format (#0001130)
 | 
			
		||||
 | 
			
		||||
2007-07-29  Brian Matherly <brian@gramps-project.org>
 | 
			
		||||
	* src/plugins/MarkerReport.py: Typo.
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -452,9 +452,7 @@ class MergePeople:
 | 
			
		||||
            new.add_media_reference(photo)
 | 
			
		||||
 | 
			
		||||
        # note
 | 
			
		||||
        note1 = self.p1.get_note_object()
 | 
			
		||||
        note2 = self.p2.get_note_object()
 | 
			
		||||
        new.set_note_object(self.merge_notes(note1,note2))
 | 
			
		||||
        new.set_note_list(self.p1.get_note_list() + self.p2.get_note_list())
 | 
			
		||||
        
 | 
			
		||||
    def merge_gramps_ids(self,new):
 | 
			
		||||
        """
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user