From 1b68641269ca61b41dd621ca663e9aab5ffce52f Mon Sep 17 00:00:00 2001
From: Andreas Osim <andreas.osim@glaser-co.at>
Date: Fri, 16 Nov 2018 09:20:26 +0100
Subject: [PATCH] bug fix dp_reports/dp_reports_template; add street2 to
 partner-address

---
 .../dp_reports/reports/report_templates.xml            | 10 +++++++---
 .../dp_reports_account/reports/invoice.xml             |  4 ++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ext/custom-addons/dp_reports/reports/report_templates.xml b/ext/custom-addons/dp_reports/reports/report_templates.xml
index c426c32d..93dfc78e 100644
--- a/ext/custom-addons/dp_reports/reports/report_templates.xml
+++ b/ext/custom-addons/dp_reports/reports/report_templates.xml
@@ -47,9 +47,9 @@
                         <t t-if="not (env.context.get('proforma', False) or is_pro_forma)">
 <!--
 -->
-                            <span t-if="not data.get('tz_report_production', False) and o.state not in ['draft','sent']">Auftragsbestätigung</span>
-                            <span t-if="not data.get('tz_report_production', False) and o.state in ['draft','sent']">Angebot</span>
-                            <span t-if="data.get('tz_report_production',False)">Produktionsschein</span>
+                            <span t-if="not (data or {}).get('tz_report_production', False) and o.state not in ['draft','sent']">Auftragsbestätigung</span>
+                            <span t-if="not (data or {}).get('tz_report_production', False) and o.state in ['draft','sent']">Angebot</span>
+                            <span t-if="(data or {}).get('tz_report_production',False)">Produktionsschein</span>
                         </t>
                         <t t-if="env.context.get('proforma', False) or is_pro_forma">
                             <span>Proformarechnung</span>
@@ -187,6 +187,10 @@
             </t>
             <span t-esc="o.partner_id.street"/>
             <br/>
+            <t t-if="o.partner_id.street2">
+                <span t-esc="o.partner_id.street2"/>
+                <br/>
+            </t>
             <span t-esc="o.partner_id.zip"/>
             <span t-esc="o.partner_id.city"/>
             <br/>
diff --git a/ext/custom-addons/dp_reports_account/reports/invoice.xml b/ext/custom-addons/dp_reports_account/reports/invoice.xml
index 2ddf91e7..9ad04f7f 100644
--- a/ext/custom-addons/dp_reports_account/reports/invoice.xml
+++ b/ext/custom-addons/dp_reports_account/reports/invoice.xml
@@ -17,6 +17,10 @@
                             </t>
                             <span t-esc="o.partner_id.street"/>
                             <br/>
+                            <t t-if="o.partner_id.street2">
+                                <span t-esc="o.partner_id.street2"/>
+                                <br/>
+                            </t>
                             <span t-esc="o.partner_id.zip"/>
                             <span t-esc="o.partner_id.city"/>
                             <br/>