From c2f176953b489cc69161d37264a763d1652bfbaf Mon Sep 17 00:00:00 2001
From: Andreas Osim <andreas.osim@glaser-co.at>
Date: Thu, 7 May 2020 08:22:28 +0200
Subject: [PATCH] Fix for DlvLogo/OcLogo

---
 .../dp_reports/reports/report_templates.xml          | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/ext/custom-addons/dp_reports/reports/report_templates.xml b/ext/custom-addons/dp_reports/reports/report_templates.xml
index 009a2ff7..e0e65fa2 100644
--- a/ext/custom-addons/dp_reports/reports/report_templates.xml
+++ b/ext/custom-addons/dp_reports/reports/report_templates.xml
@@ -103,11 +103,13 @@
                     </p>
                 </div>
                 <div class="col-xs-5 text-right">
-                    <t t-if="(DlvRetailLogo or DlvLogo) and o._name == 'stock.picking' and is_picking">
+<!--                    <t t-if="(DlvRetailLogo or DlvLogo) and o._name == 'stock.picking' and is_picking"> -->
+<!--                    <t t-elif="OcLogo and not (data or {}).get('tz_report_production', False) and o.state not in ['draft','sent']"> -->
+                    <t t-if="DlvRetailLogo or DlvLogo">
                         <img t-if="o.sale_id.partner_id.retail_partner_id.image" t-att-src="'data:image/png;base64,%s' % o.sale_id.partner_id.retail_partner_id.image.decode()"
                              style="max-height: 85px;"/>
                     </t>
-                    <t t-elif="OcLogo and not (data or {}).get('tz_report_production', False) and o.state not in ['draft','sent']">
+                    <t t-elif="OcLogo">
                         <img t-if="o.partner_id.retail_partner_id.image" t-att-src="'data:image/png;base64,%s' % o.partner_id.retail_partner_id.image.decode()"
                              style="max-height: 85px;"/>
                     </t>
@@ -128,7 +130,9 @@
             <div class="row">
                 <hr class="red-line-1"/>
             </div>
-            <t t-if="(DlvRetailLogo or DlvLogo) and o._name == 'stock.picking' and is_picking">
+<!--            <t t-if="(DlvRetailLogo or DlvLogo) and o._name == 'stock.picking' and is_picking"> -->
+<!--            <t t-elif="OcLogo and not (data or {}).get('tz_report_production', False) and o.state not in ['draft','sent']"> -->
+            <t t-if="DlvRetailLogo or DlvLogo">
                 <div class="row" style="padding-left:0;">
                     <div class="col-xs-12 text-center">
                         <strong>
@@ -150,7 +154,7 @@
                     </div>
                 </div>
             </t>
-            <t t-elif="OcLogo and not (data or {}).get('tz_report_production', False) and o.state not in ['draft','sent']">
+            <t t-elif="OcLogo">
                 <div class="row" style="padding-left:0;">
                     <div class="col-xs-12 text-center">
                         <strong>