From afa28f075abdbe865f35d41b72c15646718626a7 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Wed, 9 Dec 2015 11:32:38 +0100
Subject: [PATCH] [FIX] website_quote: message if SO not confirmed

Commit 486cd3309 was not correctly forward ported. We also add a
specific message if the quotation is in state 'draft'.

Fixes #9226
---
 addons/website_quote/static/src/js/website_quotation.js | 3 ++-
 addons/website_quote/views/website_quotation.xml        | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/website_quote/static/src/js/website_quotation.js b/addons/website_quote/static/src/js/website_quotation.js
index f4e17c92bed..ef0389e187a 100644
--- a/addons/website_quote/static/src/js/website_quotation.js
+++ b/addons/website_quote/static/src/js/website_quotation.js
@@ -102,8 +102,9 @@ if(!$('.o_website_quote').length) {
                     'signer': signer_name,
                     'sign': signature?JSON.stringify(signature[1]):false,
                 }).then(function (data) {
+                    var message_id = (data) ? 3 : 4;
                     self.$el.modal('hide');
-                    window.location.href = '/quote/'+order_id.toString()+'/'+token+'?message=3';
+                    window.location.href = '/quote/'+order_id.toString()+'/'+token+'?message='+message_id;
                 });
                 return false;
             }
diff --git a/addons/website_quote/views/website_quotation.xml b/addons/website_quote/views/website_quotation.xml
index 5cd9545d17e..be4fe376270 100644
--- a/addons/website_quote/views/website_quotation.xml
+++ b/addons/website_quote/views/website_quotation.xml
@@ -227,9 +227,10 @@
                       </div>
                       <div class="alert alert-warning alert-dismissable" t-if="message==4 and quotation.state != 'sent'">
                           <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&amp;times;</button>
-                          This order has already been 
-                            <t t-if="quotation.state=='cancel'">cancelled</t>
-                            <t t-if="quotation.state not in ('cancel','draft')">validated</t>
+                          This order 
+                            <t t-if="quotation.state=='draft'">has not yet been sent</t>
+                            <t t-if="quotation.state=='cancel'">has already been cancelled</t>
+                            <t t-if="quotation.state not in ('cancel','draft')">has already been validated</t>
                           ! You can <a href="#discussion">contact us</a> for
                           any question.
                       </div>