From 0988e01d2195dbd407d3d2e80c2ce435c057d580 Mon Sep 17 00:00:00 2001
From: Andreas Osim <andreas.osim@glaser-co.at>
Date: Tue, 12 May 2020 09:19:26 +0200
Subject: [PATCH] Fix Report_Template (DlvLogo)

---
 .../dp_reports/reports/report_templates.xml   | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/ext/custom-addons/dp_reports/reports/report_templates.xml b/ext/custom-addons/dp_reports/reports/report_templates.xml
index e0e65fa2..697547f1 100644
--- a/ext/custom-addons/dp_reports/reports/report_templates.xml
+++ b/ext/custom-addons/dp_reports/reports/report_templates.xml
@@ -105,10 +105,14 @@
                 <div class="col-xs-5 text-right">
 <!--                    <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">
+                    <t t-if="DlvRetailLogo">
                         <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-if="DlvLogo">
+                        <img t-if="o.sale_id.partner_id.image" t-att-src="'data:image/png;base64,%s' % o.sale_id.partner_id.image.decode()"
+                             style="max-height: 85px;"/>
+                    </t>
                     <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;"/>
@@ -132,7 +136,7 @@
             </div>
 <!--            <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">
+            <t t-if="DlvRetailLogo">
                 <div class="row" style="padding-left:0;">
                     <div class="col-xs-12 text-center">
                         <strong>
@@ -154,6 +158,28 @@
                     </div>
                 </div>
             </t>
+            <t t-if="DlvLogo">
+                <div class="row" style="padding-left:0;">
+                    <div class="col-xs-12 text-center">
+                        <strong>
+                            <span t-esc="o.sale_id.partner_id.name"/>
+                            &#183;
+                            <span t-esc="o.sale_id.partner_id.street"/>
+                            &#183;
+                            <span t-esc="o.sale_id.partner_id.zip"/>
+                            <span t-esc="o.sale_id.partner_id.city"/>
+                            &#183;
+                            <span t-esc="o.sale_id.partner_id.phone"/>
+                            &#183;
+                            <span t-esc="o.sale_id.partner_id.email"/>
+                            <t t-if ="o.sale_id.partner_id.website">
+                                &#183;
+                                <span t-esc="o.sale_id.partner_id.website.replace('http://', '').replace('https://', '')"/>
+                            </t>
+                        </strong>
+                    </div>
+                </div>
+            </t>
             <t t-elif="OcLogo">
                 <div class="row" style="padding-left:0;">
                     <div class="col-xs-12 text-center">