diff --git a/addons/portal_sale/portal_sale_data.xml b/addons/portal_sale/portal_sale_data.xml
index 2da55bcb081..35b1434fe3f 100644
--- a/addons/portal_sale/portal_sale_data.xml
+++ b/addons/portal_sale/portal_sale_data.xml
@@ -26,6 +26,9 @@
        &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />
        &nbsp;&nbsp;Order total: <strong>${object.amount_total} ${object.pricelist_id.currency_id.name}</strong><br />
        &nbsp;&nbsp;Order date: ${object.date_order}<br />
+       % if object.validity_date and object.state in ('draft', 'sent'):
+       &nbsp;&nbsp;Expiration date: ${object.validity_date}<br />
+       % endif
        % if object.origin:
        &nbsp;&nbsp;Order reference: ${object.origin}<br />
        % endif
diff --git a/addons/sale/edi/sale_order_action_data.xml b/addons/sale/edi/sale_order_action_data.xml
index 4ad657d7f82..22a8b32016d 100644
--- a/addons/sale/edi/sale_order_action_data.xml
+++ b/addons/sale/edi/sale_order_action_data.xml
@@ -40,6 +40,9 @@
        &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />
        &nbsp;&nbsp;Order total: <strong>${object.amount_total} ${object.pricelist_id.currency_id.name}</strong><br />
        &nbsp;&nbsp;Order date: ${object.date_order}<br />
+       % if object.validity_date and object.state in ('draft', 'sent'):
+       &nbsp;&nbsp;Expiration date: ${object.validity_date}<br />
+       % endif
        % if object.origin:
        &nbsp;&nbsp;Order reference: ${object.origin}<br />
        % endif
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 20aea2d90c0..a0d8cb0b8be 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -190,6 +190,7 @@ class sale_order(osv.osv):
               in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception).\nThe 'Waiting Schedule' status is set when the invoice is confirmed\
                but waiting for the scheduler to run on the order date.", select=True),
         'date_order': fields.datetime('Date', required=True, readonly=True, select=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, copy=False),
+        'validity_date': fields.date('Expiration Date', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}),
         'create_date': fields.datetime('Creation Date', readonly=True, select=True, help="Date on which sales order is created."),
         'date_confirm': fields.date('Confirmation Date', readonly=True, select=True, help="Date on which sales order is confirmed.", copy=False),
         'user_id': fields.many2one('res.users', 'Salesperson', states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, select=True, track_visibility='onchange'),
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index f974ec5b540..d67d810e28f 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -203,6 +203,7 @@
                                     <field name="section_id" options="{'no_create': True}" groups="base.group_multi_salesteams"/>
                                     <field groups="base.group_no_one" name="origin"/>
                                     <field name="client_order_ref"/>
+                                    <field name="validity_date"/>
                                 </group>
                                 <group name="sale_pay">
                                     <field name="payment_term" options="{'no_create': True}"/>
diff --git a/addons/sale/views/report_saleorder.xml b/addons/sale/views/report_saleorder.xml
index 45ec4a77ac7..10f7398dadf 100644
--- a/addons/sale/views/report_saleorder.xml
+++ b/addons/sale/views/report_saleorder.xml
@@ -45,8 +45,8 @@
                     <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>
+                <div t-if="o.validity_date and o.state in ['draft','sent']" class="col-xs-3">
+                    <strong>Expiration Date:</strong>
                     <p t-field="o.validity_date"/>
                 </div>
                 <div t-if="o.payment_term" class="col-xs-3">
diff --git a/addons/website_quote/models/order.py b/addons/website_quote/models/order.py
index 28cbe318477..345991e12e9 100644
--- a/addons/website_quote/models/order.py
+++ b/addons/website_quote/models/order.py
@@ -114,7 +114,6 @@ class sale_order(osv.osv):
         'template_id': fields.many2one('sale.quote.template', 'Quote Template', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}),
         'website_description': fields.html('Description'),
         'options' : fields.one2many('sale.order.option', 'order_id', 'Optional Products Lines', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}),
-        'validity_date': fields.date('Validity Date', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}),
         '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/website_quotation_backend.xml b/addons/website_quote/views/website_quotation_backend.xml
index d7ef04e47b8..003e575d2ef 100644
--- a/addons/website_quote/views/website_quotation_backend.xml
+++ b/addons/website_quote/views/website_quotation_backend.xml
@@ -28,7 +28,6 @@
                 </xpath>
                 <xpath expr="//field[@name='client_order_ref']" position="after">
                     <field name="template_id" on_change="onchange_template_id(template_id, partner_id, fiscal_position)"/>
-                    <field name="validity_date" attrs="{'invisible': [('template_id','=',False)]}"/>
                     <field name="website_description" invisible="1"/>
                 </xpath>
             </field>