From 9da68c84a385334194a538e4ab8c5794ebfe6c6c Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
Date: Sat, 20 Jul 2019 21:13:36 -0500
Subject: [PATCH] [FIX] partner_brand: max-height

---
 partner_brand/views/report_template.xml | 27 ++++++++++---------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/partner_brand/views/report_template.xml b/partner_brand/views/report_template.xml
index 4294a4f78..007515e1b 100644
--- a/partner_brand/views/report_template.xml
+++ b/partner_brand/views/report_template.xml
@@ -7,37 +7,32 @@
               inherit_id="web.external_layout_standard">
 
         <xpath expr="//img[@t-if='company.logo']" position="replace">
-            <t t-if="'brand_id' in o.fields_get()">
-                <img t-if="o.brand_id"
+            <t t-if="'brand_id' in o.fields_get() and o.brand_id">
+                <img t-if="o.brand_id.image"
                      t-att-src="image_data_uri(o.brand_id.image)"
-                     style="max_height: 45px;" alt="Logo"/>
-                <img t-elif="company.logo"
-                     t-att-src="image_data_uri(company.logo)"
-                     style="max_height: 45px;" alt="Logo"/>
+                     style="max-height: 45px;" alt="Logo"/>
             </t>
-            <t t-else="else">
+            <t t-else="">
                 <img t-if="company.logo"
                      t-att-src="image_data_uri(company.logo)"
-                     style="max_height: 45px;" alt="Logo"/>
+                     style="max-height: 45px;" alt="Logo"/>
             </t>
         </xpath>
 
         <xpath expr="//div[@t-field='company.partner_id']" position="replace">
-            <t t-if="'brand_id' in o.fields_get()">
-                <div t-if="o.brand_id" t-field="o.brand_id"
-                     t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": true}'/>
-                <div t-else="else" t-field="company.partner_id"
+            <t t-if="'brand_id' in o.fields_get() and o.brand_id">
+                <div t-field="o.brand_id"
                      t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": true}'/>
             </t>
-            <t t-else="else">
+            <t t-else="">
                 <div t-field="company.partner_id"
                      t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": true}'/>
             </t>
         </xpath>
 
         <xpath expr="//ul[hasclass('list-inline')]" position="replace">
-                <t t-if="'brand_id' in o.fields_get()">
-                    <ul t-if="o.brand_id" class="list-inline mb4">
+                <t t-if="'brand_id' in o.fields_get() and o.brand_id">
+                    <ul class="list-inline mb4">
                         <li t-if="o.brand_id.phone" class="list-inline-item">
                             Phone:
                             <span t-field="o.brand_id.phone"/>
@@ -52,7 +47,7 @@
                         </li>
                     </ul>
                 </t>
-                <t t-else="else">
+                <t t-else="">
                     <ul t-if="company" class="list-inline mb4">
                         <li t-if="company.phone"
                             class="list-inline-item">