Merge pull request #1563 from odoo-dev/saas-4-sale-report-validity-date-sle

website_quote: renamed validity date to expiry date & adapted the sale order report to display the expiry date in website_quote module instead of sale module

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"/>

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',
     ],

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'))
     }

addons/website_quote/views/report_saleorder.xml

+<?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>Expiry Date:</strong>
+            <p t-field="o.validity_date"/>
+        </div>
+    </xpath>
+</template>
+</data>
+</openerp>