From fe7b9ab709f503bf3bec1bed680ab2d738077d29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Rahir?= <rar@odoo.com>
Date: Thu, 12 Apr 2018 10:15:49 +0200
Subject: [PATCH] [FIX] sale: missing field in quotation report

Before this commit, the field validity_date was missing from the
default quotation report. Historically this field was added in
module website_quote but it was then moved to sale in
77bd5181f7991de5c3c0fadd1fbada93b6d9d2b1

The modification on the quotation report related to validity_date
were missed at that time.

This commit adds validity_date to the default quotation report.
---
 addons/sale/report/sale_report_templates.xml         | 4 ++++
 addons/website_quote/report/sale_order_templates.xml | 6 ------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/addons/sale/report/sale_report_templates.xml b/addons/sale/report/sale_report_templates.xml
index 3352f75b048..8f7c66edc1a 100644
--- a/addons/sale/report/sale_report_templates.xml
+++ b/addons/sale/report/sale_report_templates.xml
@@ -60,6 +60,10 @@
                     <strong>Payment Terms:</strong>
                     <p t-field="doc.payment_term_id"/>
                 </div>
+                <div t-if="doc.validity_date and doc.state in ['draft', 'sent']" class="col-xs-3">
+                    <strong>Expiration Date:</strong>
+                    <p t-field="doc.validity_date"/>
+                </div>
             </div>
 
             <!-- Is there a discount on at least one line? -->
diff --git a/addons/website_quote/report/sale_order_templates.xml b/addons/website_quote/report/sale_order_templates.xml
index 308df119a16..ad67e5e9439 100644
--- a/addons/website_quote/report/sale_order_templates.xml
+++ b/addons/website_quote/report/sale_order_templates.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 <template id="report_saleorder_validity_date" inherit_id="sale.report_saleorder_document">
-    <xpath expr="//div[hasclass('page')]/div[@id='informations']" position="inside">
-        <div t-if="doc.validity_date and doc.state in ['draft', 'sent']" class="col-xs-3">
-            <strong>Expiration Date:</strong>
-            <p t-field="doc.validity_date"/>
-        </div>
-    </xpath>
     <xpath expr="//div[hasclass('page')]/p[@id='fiscal_position_remark']" position="after">
         <div t-if="doc.options and doc.state in ['draft', 'sent']" style="page-break-before:always;">
             <h2>