Bug fix in S2B letter composition

CompassionCH · Jan 27, 2020 · b696b08 · b696b08
1 parent 5b43fe4
commit b696b08
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/sbc_compassion/models/correspondence.py b/sbc_compassion/models/correspondence.py
@@ -604,6 +604,11 @@ def _get_translation_boxes(self):
                               "".join((p.english_text or "").split()))
         else:
             source = 'english_text'
+            # Avoid capturing translations that are the same text as the
+            # original text.
+            pages = pages.filtered(source).filtered(
+                lambda p: "".join((p.english_text or "").split()) !=
+                          "".join((p.original_text or "").split()))
         if not getattr(self, source):
             return text_boxes
 
@@ -618,7 +623,7 @@ def _get_translation_boxes(self):
             text_boxes.extend([
                 t.strip() for t in text.split(BOX_SEPARATOR)])
 
-        return text_boxes
+        return source, text_boxes
 
     @api.model
     def process_commkit(self, commkit_data):
@@ -745,7 +750,7 @@ def generate_original_pdf(self):
             ).encode('utf8')
 
         image_data = self.mapped('original_attachment_ids.datas') or []
-        translation_boxes = self._get_translation_boxes()
+        source, translation_boxes = self._get_translation_boxes()
         return self.template_id.generate_pdf(
             pdf_name, (header, ''), {'Original': [self.original_text],
                                      'Translation': translation_boxes},