From 9c934f2c5d24327de36d7f714a1048ff69b976d5 Mon Sep 17 00:00:00 2001 From: Daniel Gergely Date: Mon, 16 Nov 2026 16:02:23 +0100 Subject: [PATCH] [T3646] FIX: own layout for GMC S10 child letters, no translation over page 2's printed text --- sbc_compassion/__manifest__.py | 2 +- sbc_compassion/data/child_layouts.xml | 16 ++++++++++ .../migrations/18.0.1.0.8/post-migration.py | 30 +++++++++++++++++++ sbc_compassion/models/correspondence.py | 5 +++- 4 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 sbc_compassion/migrations/18.0.1.0.8/post-migration.py diff --git a/sbc_compassion/__manifest__.py b/sbc_compassion/__manifest__.py index f1523dfd0..0f8eaf5e4 100644 --- a/sbc_compassion/__manifest__.py +++ b/sbc_compassion/__manifest__.py @@ -28,7 +28,7 @@ # pylint: disable=C8101 { "name": "Sponsor to Participant communication", - "version": "18.0.1.0.7", + "version": "18.0.1.0.8", "category": "Compassion", "summary": "SBC - Supporter to Participant Communication", "sequence": 150, diff --git a/sbc_compassion/data/child_layouts.xml b/sbc_compassion/data/child_layouts.xml index b5e62b2c1..686712fce 100644 --- a/sbc_compassion/data/child_layouts.xml +++ b/sbc_compassion/data/child_layouts.xml @@ -250,4 +250,20 @@ eval="[(4, ref('b2s_additional_page_box_1'))]" /> + + + B2S - S10 + b2s + CH-A-1S11-1 + + + + + 1 + + + + + 2 + diff --git a/sbc_compassion/migrations/18.0.1.0.8/post-migration.py b/sbc_compassion/migrations/18.0.1.0.8/post-migration.py new file mode 100644 index 000000000..b44622616 --- /dev/null +++ b/sbc_compassion/migrations/18.0.1.0.8/post-migration.py @@ -0,0 +1,30 @@ +import logging + +from openupgradelib import openupgrade + +_logger = logging.getLogger(__name__) + + +@openupgrade.migrate() +def migrate(env, version): + # T3646: S10 letters printing their translation over page 2's printed text + l1 = env.ref("sbc_compassion.b2s_l1") + messages = env["gmc.message"].search([("content", "like", "-1S10-")]) + messages = messages.filtered(lambda m: m.action_id.model == "correspondence") + letter_ids = [ + int(letter_id) + for message in messages + for letter_id in (message.object_ids or str(message.object_id)).split(",") + if letter_id.strip().isdigit() + ] + letters = env["correspondence"].search( + [("id", "in", letter_ids), ("template_id", "=", l1.id)] + ) + letters = letters.filtered( + lambda letter: any( + len((paragraph.translated_text or "").strip()) >= 5 + for paragraph in letter.page_ids[1:2].paragraph_ids + ) + ) + _logger.info("Move %s letters to the S10 layout", len(letters)) + letters.write({"template_id": env.ref("sbc_compassion.b2s_l1_s10").id}) diff --git a/sbc_compassion/models/correspondence.py b/sbc_compassion/models/correspondence.py index 7f1e2b87c..1a14c144e 100644 --- a/sbc_compassion/models/correspondence.py +++ b/sbc_compassion/models/correspondence.py @@ -1102,7 +1102,10 @@ def json_to_data(self, json, mapping_name=None): odoo_data = super().json_to_data(json, mapping_name) odoo_data["is_compassion_moment"] = template_name == COMPASSION_MOMENT_TEMPLATE - if not template_name.startswith("CH"): + if "-1S10-" in template_name: + # Stationery without translation area on page 2 + odoo_data["template_id"] = self.env.ref("sbc_compassion.b2s_l1_s10").id + elif not template_name.startswith("CH"): template = self.env["correspondence.template"].search( [("name", "like", "L" + template_name[5]), ("name", "like", "B2S")], limit=1,