From dbab59039c7c2a8abe1e625027c8e7c622809d94 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Sat, 26 Feb 2022 11:00:08 +0100
Subject: [PATCH] Fix: recherche images fond de page (logos)

---
 app/scodoc/sco_pdf.py   | 8 ++++++--
 app/scodoc/sco_pvpdf.py | 6 ++++++
 sco_version.py          | 2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/scodoc/sco_pdf.py b/app/scodoc/sco_pdf.py
index 0e099680..3949f50a 100755
--- a/app/scodoc/sco_pdf.py
+++ b/app/scodoc/sco_pdf.py
@@ -220,12 +220,16 @@ class ScolarsPageTemplate(PageTemplate):
         PageTemplate.__init__(self, "ScolarsPageTemplate", [content])
         self.logo = None
         logo = find_logo(
-            logoname="bul_pdf_background", dept_id=g.scodoc_dept_id, prefix=None
+            logoname="bul_pdf_background", dept_id=g.scodoc_dept_id
+        ) or find_logo(
+            logoname="bul_pdf_background", dept_id=g.scodoc_dept_id, prefix=""
         )
         if logo is None:
             # Also try to use PV background
             logo = find_logo(
-                logoname="letter_background", dept_id=g.scodoc_dept_id, prefix=None
+                logoname="letter_background", dept_id=g.scodoc_dept_id
+            ) or find_logo(
+                logoname="letter_background", dept_id=g.scodoc_dept_id, prefix=""
             )
         if logo is not None:
             self.background_image_filename = logo.filepath
diff --git a/app/scodoc/sco_pvpdf.py b/app/scodoc/sco_pvpdf.py
index 1fb98e3d..2e8cdaf6 100644
--- a/app/scodoc/sco_pvpdf.py
+++ b/app/scodoc/sco_pvpdf.py
@@ -206,12 +206,18 @@ class CourrierIndividuelTemplate(PageTemplate):
             background = find_logo(
                 logoname="pvjury_background",
                 dept_id=g.scodoc_dept_id,
+            ) or find_logo(
+                logoname="pvjury_background",
+                dept_id=g.scodoc_dept_id,
                 prefix="",
             )
         else:
             background = find_logo(
                 logoname="letter_background",
                 dept_id=g.scodoc_dept_id,
+            ) or find_logo(
+                logoname="letter_background",
+                dept_id=g.scodoc_dept_id,
                 prefix="",
             )
         if not self.background_image_filename and background is not None:
diff --git a/sco_version.py b/sco_version.py
index 1bdc8323..7eaec052 100644
--- a/sco_version.py
+++ b/sco_version.py
@@ -1,7 +1,7 @@
 # -*- mode: python -*-
 # -*- coding: utf-8 -*-
 
-SCOVERSION = "9.1.64"
+SCOVERSION = "9.1.65"
 
 SCONAME = "ScoDoc"