[16.0][IMP] choose between brand or company values in layout

brand_external_report_layout/models/__init__.py

@@ -1 +1,2 @@
 from . import res_brand
+from . import res_company

brand_external_report_layout/models/res_brand.py

@@ -11,6 +11,21 @@ class ResBrand(models.Model):
 
     _inherit = "res.brand"
 
+    def _get_company_overriden_fields(self):
+        return [
+            "name",
+            "logo",
+            "external_report_layout_id",
+            "report_header",
+            "report_footer",
+            "paperformat_id",
+            "font",
+            "primary_color",
+            "secondary_color",
+            "layout_background",
+            "layout_background_image",
+        ]
+
     def _get_default_brand_logo(self):
         return base64.b64encode(
             open(

brand_external_report_layout/models/res_company.py

@@ -0,0 +1,24 @@
+# Copyright 2024 Akretion (https://www.akretion.com).
+# @author Kévin Roche <[email protected]>
+
+from odoo import models
+
+
+class CompanyBrandAdapter:
+    def __init__(self, company, brand):
+        super().__init__()
+        for field in dir(company):
+            if field.startswith("__"):
+                continue
+            brands_fields = brand._get_company_overriden_fields()
+            if field in brands_fields and getattr(brand, field):
+                setattr(self, field, getattr(brand, field))
+            else:
+                setattr(self, field, getattr(company, field))
+
+
+class ResCompany(models.Model):
+    _inherit = "res.company"
+
+    def _get_company_brand_adapter(self, brand):
+        return CompanyBrandAdapter(self, brand)

brand_external_report_layout/views/report_template.xml

@@ -16,8 +16,11 @@
                 t-if="o and 'brand_id' in o.fields_get() and o.brand_id and o.brand_id.external_report_layout_id"
                 t-call="{{o.brand_id.external_report_layout_id.sudo().key}}"
             >
-                <t t-set="company" t-value="o.brand_id.sudo()" />
-                <t t-raw="0" />
+                <t
+                    t-set="company"
+                    t-value="company.sudo()._get_company_brand_adapter(o.brand_id)"
+                />
+                <t t-out="0" />
             </t>
             <t t-else="else" name="brand_not_set" />
         </xpath>