From 834dfc00ebf046613f69221043e8bd5350b94322 Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Mon, 4 Aug 2014 14:45:38 +0200
Subject: [PATCH 1/2] [FIX] sale/website_quote: inherit the sale order report
 to show the validity date

---
 addons/sale/views/report_saleorder.xml          |  6 +-----
 addons/website_quote/__openerp__.py             |  1 +
 addons/website_quote/views/report_saleorder.xml | 13 +++++++++++++
 3 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 addons/website_quote/views/report_saleorder.xml

diff --git a/addons/sale/views/report_saleorder.xml b/addons/sale/views/report_saleorder.xml
index 243004869e3..a61120c4216 100644
--- a/addons/sale/views/report_saleorder.xml
+++ b/addons/sale/views/report_saleorder.xml
@@ -31,7 +31,7 @@
                 <span t-field="o.name"/>
             </h2>
 
-            <div class="row mt32 mb32">
+            <div class="row mt32 mb32" id="informations">
                 <div t-if="o.client_order_ref" class="col-xs-3">
                     <strong>Your Reference:</strong>
                     <p t-field="o.client_order_ref"/>
@@ -45,10 +45,6 @@
                     <strong>Salesperson:</strong>
                     <p t-field="o.user_id.name"/>
                 </div>
-                <div t-if="o.validity_date" class="col-xs-3">
-                    <strong>Validity Date:</strong>
-                    <p t-field="o.validity_date"/>
-                </div>
                 <div t-if="o.payment_term" class="col-xs-3">
                     <strong>Payment Term:</strong>
                     <p t-field="o.payment_term"/>
diff --git a/addons/website_quote/__openerp__.py b/addons/website_quote/__openerp__.py
index 3991f6ac17e..79e2c818aef 100644
--- a/addons/website_quote/__openerp__.py
+++ b/addons/website_quote/__openerp__.py
@@ -13,6 +13,7 @@ OpenERP Sale Quote Roller
     'data': [
         'views/website_quotation.xml',
         'views/website_quotation_backend.xml',
+        'views/report_saleorder.xml',
         'data/website_quotation_data.xml',
         'security/ir.model.access.csv',
     ],
diff --git a/addons/website_quote/views/report_saleorder.xml b/addons/website_quote/views/report_saleorder.xml
new file mode 100644
index 00000000000..a6f7b9879e8
--- /dev/null
+++ b/addons/website_quote/views/report_saleorder.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+<template id="report_saleorder_validity_date" inherit_id="sale.report_saleorder_document">
+    <xpath expr="//div[@class='page']/div[@id='informations']" position="inside">
+        <div t-if="o.validity_date" class="col-xs-3">
+            <strong>Validity Date:</strong>
+            <p t-field="o.validity_date"/>
+        </div>
+    </xpath>
+</template>
+</data>
+</openerp>

From e56635c3f1eee726f4e1c94be030d121e78d3112 Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Mon, 4 Aug 2014 15:49:16 +0200
Subject: [PATCH 2/2] [REF] website_quote: displayed string of validity_date
 field changed from 'Validity Date' to 'Expiry Date'

---
 addons/website_quote/models/order.py            | 2 +-
 addons/website_quote/views/report_saleorder.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_quote/models/order.py b/addons/website_quote/models/order.py
index c031baf7632..b19614410b5 100644
--- a/addons/website_quote/models/order.py
+++ b/addons/website_quote/models/order.py
@@ -114,7 +114,7 @@ class sale_order(osv.osv):
         'template_id': fields.many2one('sale.quote.template', 'Quote Template'),
         'website_description': fields.html('Description'),
         'options' : fields.one2many('sale.order.option', 'order_id', 'Optional Products Lines'),
-        'validity_date': fields.date('Validity Date'),
+        'validity_date': fields.date('Expiry Date'),
         'amount_undiscounted': fields.function(_get_total, string='Amount Before Discount', type="float",
             digits_compute=dp.get_precision('Account'))
     }
diff --git a/addons/website_quote/views/report_saleorder.xml b/addons/website_quote/views/report_saleorder.xml
index a6f7b9879e8..e85a48f9d22 100644
--- a/addons/website_quote/views/report_saleorder.xml
+++ b/addons/website_quote/views/report_saleorder.xml
@@ -4,7 +4,7 @@
 <template id="report_saleorder_validity_date" inherit_id="sale.report_saleorder_document">
     <xpath expr="//div[@class='page']/div[@id='informations']" position="inside">
         <div t-if="o.validity_date" class="col-xs-3">
-            <strong>Validity Date:</strong>
+            <strong>Expiry Date:</strong>
             <p t-field="o.validity_date"/>
         </div>
     </xpath>