diff --git a/addons/website_quotation/controllers/main.py b/addons/website_quotation/controllers/main.py
index 66de8241cc2..6a38d443bde 100644
--- a/addons/website_quotation/controllers/main.py
+++ b/addons/website_quotation/controllers/main.py
@@ -143,7 +143,6 @@ class sale_quote(http.Controller):
             'product_uom_qty': option.quantity,
             'product_uom_id': option.uom_id.id,
             'discount': option.discount,
-            'is_optional': True,
         })
         line = request.registry.get('sale.order.line').create(request.cr, SUPERUSER_ID, vals, context=request.context)
         option_obj.write(request.cr, SUPERUSER_ID, [option.id], {'line_id': line}, context=request.context)
diff --git a/addons/website_quotation/models/order.py b/addons/website_quotation/models/order.py
index c8ce70fa12b..6c71cf80071 100644
--- a/addons/website_quotation/models/order.py
+++ b/addons/website_quotation/models/order.py
@@ -74,7 +74,7 @@ class sale_order_line(osv.osv):
     _description = "Sales Order Line"
     _columns = {
         'website_description': fields.html('Line Description'),
-        'is_optional': fields.boolean('Optional Product')
+        'option_line_id':fields.one2many('sale.option.line', 'line_id', 'Optional Products Lines'),
     }
     def product_id_change(self, cr, uid, ids, pricelist, product, qty=0, uom=False, qty_uos=0, uos=False, name='', partner_id=False, lang=False, update_tax=True, date_order=False, packaging=False, fiscal_position=False, flag=False, context=None):
         res = super(sale_order_line, self).product_id_change(cr, uid, ids, pricelist, product, qty, uom, qty_uos, uos, name, partner_id, lang, update_tax, date_order, packaging, fiscal_position, flag, context)
diff --git a/addons/website_quotation/views/website_quotation.xml b/addons/website_quotation/views/website_quotation.xml
index b70341565f2..d7ecc9b4393 100644
--- a/addons/website_quotation/views/website_quotation.xml
+++ b/addons/website_quotation/views/website_quotation.xml
@@ -49,7 +49,7 @@
                               t-field-options='{"widget": "monetary", "display_currency": "quotation.pricelist_id.currency_id"}'/>
                       </td>
                       <td>
-                          <a t-href="./update_line/#{ line.id }/?order_id=#{ quotation.id }&amp;unlink=True&amp;token=#{ quotation.access_token }" class="mb8 js_update_line_json pull-right hidden-print" t-if="line.is_optional">
+                          <a t-href="./update_line/#{ line.id }/?order_id=#{ quotation.id }&amp;unlink=True&amp;token=#{ quotation.access_token }" class="mb8 js_update_line_json pull-right hidden-print" t-if="line.option_line_id">
                               <span class="fa fa-trash-o"></span>
                           </a>
                       </td>
@@ -172,7 +172,7 @@
                           <hr class="mt0 mb0"/>
                           <t t-call="website_quotation.navigation_menu"/>
                           <hr class="mt0 mb0"/>
-                          <div class="text-center hidden-print">
+                          <div t-if="not date_diff" class="text-center hidden-print">
                               <input type="hidden" t-att-value="quotation.validity_date" id="validity_date"/>
                               <div class="mt8" t-if="(quotation.before_discount - quotation.amount_total) > 0.0">
                                 <strong>This offer at </strong>