From bedc4e6bd8df3046b6cac6827c4bd1d795a244dd Mon Sep 17 00:00:00 2001
From: Ahmed Aly <ahmed.aly@datenpol.at>
Date: Wed, 11 Apr 2018 16:40:55 +0200
Subject: [PATCH] Feedback 1618: Andruck - Angebotsdatum / Lieferdatum - PDF
 Reports

---
 .../dp_reports_sale/reports/sale.xml          | 90 +++++++++++++------
 1 file changed, 63 insertions(+), 27 deletions(-)

diff --git a/ext/custom-addons/dp_reports_sale/reports/sale.xml b/ext/custom-addons/dp_reports_sale/reports/sale.xml
index 01bb7e70..5a5b2922 100644
--- a/ext/custom-addons/dp_reports_sale/reports/sale.xml
+++ b/ext/custom-addons/dp_reports_sale/reports/sale.xml
@@ -13,21 +13,39 @@
                         <strong>Lieferadresse</strong>
                         <div class="partner-data">
                             <span t-esc="o.partner_shipping_id.name"/>
-                            <span t-esc="o.partner_shipping_id.street"/><br/>
-                            <span t-esc="o.partner_shipping_id.zip"/> <span t-esc="o.partner_shipping_id.city"/><br/>
+                            <span t-esc="o.partner_shipping_id.street"/>
+                            <br/>
+                            <span t-esc="o.partner_shipping_id.zip"/>
+                            <span t-esc="o.partner_shipping_id.city"/>
+                            <br/>
                             <span t-esc="o.partner_shipping_id.country_id.name"/>
                         </div>
                     </div>
                     <div class="col-xs-3">
                         <strong>Rechnungsadresse</strong>
                         <div class="partner-data">
-                            <span t-esc="o.partner_invoice_id.name"/><br/>
-                            <span t-esc="o.partner_invoice_id.street"/><br/>
-                            <span t-esc="o.partner_invoice_id.zip"/> <span t-esc="o.partner_invoice_id.city"/><br/>
-                            <t t-if="o.partner_invoice_id.country_id"><span t-esc="o.partner_invoice_id.country_id.name"/><br/></t>
-                            <t t-if="o.partner_invoice_id.email"><span t-esc="o.partner_invoice_id.email"/><br/></t>
-                            <t t-if="o.partner_invoice_id.phone"><span t-esc="o.partner_invoice_id.phone"/><br/></t>
-                            <t t-if="o.partner_invoice_id.vat">UID-Nr.: <span t-esc="o.partner_invoice_id.vat"/></t>
+                            <span t-esc="o.partner_invoice_id.name"/>
+                            <br/>
+                            <span t-esc="o.partner_invoice_id.street"/>
+                            <br/>
+                            <span t-esc="o.partner_invoice_id.zip"/>
+                            <span t-esc="o.partner_invoice_id.city"/>
+                            <br/>
+                            <t t-if="o.partner_invoice_id.country_id">
+                                <span t-esc="o.partner_invoice_id.country_id.name"/>
+                                <br/>
+                            </t>
+                            <t t-if="o.partner_invoice_id.email">
+                                <span t-esc="o.partner_invoice_id.email"/>
+                                <br/>
+                            </t>
+                            <t t-if="o.partner_invoice_id.phone">
+                                <span t-esc="o.partner_invoice_id.phone"/>
+                                <br/>
+                            </t>
+                            <t t-if="o.partner_invoice_id.vat">UID-Nr.:
+                                <span t-esc="o.partner_invoice_id.vat"/>
+                            </t>
                         </div>
                     </div>
                     <div class="col-xs-3">
@@ -36,31 +54,44 @@
                 </div>
                 <div class="row mt32"/>
                 <div class="row height-20">
-                    <div class="col-xs-3">
-                        <strong><span class="col-xs-8" style="padding: 0px">Kundennr.:</span></strong>
-                        <span class="col-xs-4" style="padding: 0px" t-field="o.partner_id.ref"/>
+                    <div class="col-xs-3" style="padding-right: 5px">
+                        <strong>
+                            <span class="col-xs-8" style="padding: 0px;width: 65%;">Kundennr.:</span>
+                        </strong>
+                        <span class="col-xs-4" style="padding: 0px;width: 35%;" t-field="o.partner_id.ref"/>
                     </div>
-                    <strong><span class="col-xs-2">Ansprechpartner:</span></strong>
+                    <strong>
+                        <span class="col-xs-2">Ansprechpartner:</span>
+                    </strong>
                     <span class="col-xs-3" t-field="o.user_id"/>
-                    <strong><span class="col-xs-2">Positionen:</span></strong>
+                    <strong>
+                        <span class="col-xs-2">Positionen:</span>
+                    </strong>
                     <span class="col-xs-2" t-field="o.positions"/>
                 </div>
                 <div class="row height-20">
-                    <div class="col-xs-3">
-                        <strong><span class="col-xs-8" style="padding: 0px">Angebotsdatum:</span></strong>
-                        <span class="col-xs-4" style="padding: 0px" t-field="o.date_order" t-options='{"widget": "date"}'/>
+                    <div class="col-xs-3" style="padding-right: 5px">
+                        <strong>
+                            <span class="col-xs-8" style="padding: 0px;width: 65%;">Angebotsdatum:</span>
+                        </strong>
+                        <span class="col-xs-4" style="padding: 0px;width: 35%;" t-field="o.date_order"
+                              t-options='{"widget": "date"}'/>
                     </div>
-                    <strong><span class="col-xs-2">Email:</span></strong>
+                    <strong>
+                        <span class="col-xs-2">Email:</span>
+                    </strong>
                     <span class="col-xs-3" t-field="o.user_id.email"/>
-                    <strong><span class="col-xs-2">Artikel:</span></strong>
+                    <strong>
+                        <span class="col-xs-2">Artikel:</span>
+                    </strong>
                     <span class="col-xs-2" t-field="o.num_items"/>
                 </div>
                 <div class="row">
-                    <div class="col-xs-3">
+                    <div class="col-xs-3" style="padding-right: 5px">
                         <strong>
-                            <span class="col-xs-8" style="padding: 0px">Lieferdatum:</span>
+                            <span class="col-xs-8" style="padding: 0px;width: 65%;">Lieferdatum:</span>
                         </strong>
-                        <span class="col-xs-4" style="padding: 0px" t-field="o.earliest_scheduled_date"
+                        <span class="col-xs-4" style="padding: 0px;width: 35%;" t-field="o.earliest_scheduled_date"
                               t-options='{"widget": "date"}'/>
                     </div>
                     <strong>
@@ -99,7 +130,8 @@
                                     <span t-esc="o._formatLang(order_line.product_uom_qty, False).strip('0').strip(',')"/>
                                 </td>
                                 <td class="text-right">
-                                    <span t-field="order_line.weight"/> kg
+                                    <span t-field="order_line.weight"/>
+                                    kg
                                 </td>
                                 <td class="text-right">
                                 </td>
@@ -117,7 +149,8 @@
                                     <br/>
                                     <span t-field="order_line.name"/>
                                     <t t-if="order_line.delivery_date">
-                                        <br/><strong>Voraussichtliches Lieferdatum: </strong>
+                                        <br/>
+                                        <strong>Voraussichtliches Lieferdatum:</strong>
                                         <span t-field="order_line.delivery_date"/>
                                     </t>
                                 </td>
@@ -190,7 +223,8 @@
                     </p>
                     <p class="col-xs-12">
                         Gesamtgewicht:
-                        <span t-esc="round(o.weight_total, 2)"/> kg
+                        <span t-esc="round(o.weight_total, 2)"/>
+                        kg
                         <br/>
                     </p>
                     <p class="col-xs-12" t-if="o.incoterm.name">
@@ -204,8 +238,10 @@
                         <br/>
                     </p>
                     <p class="col-xs-12" t-if="o.state not in ['draft','sent']">
-                        Bitte prüfen Sie bei Anlieferung sofort die Verpackung bzw. Ware auf Beschädigung!<br/>
-                        Falls die beschädigte Ware angenommen wird, besteht kein Anspruch auf Kostenerstattung bzw. Austausch.
+                        Bitte prüfen Sie bei Anlieferung sofort die Verpackung bzw. Ware auf Beschädigung!
+                        <br/>
+                        Falls die beschädigte Ware angenommen wird, besteht kein Anspruch auf Kostenerstattung bzw.
+                        Austausch.
                     </p>
                     <t t-if="o.state in ['draft','sent']">
                         <p class="col-xs-12">