diff options
| author | Damien Bouvy <dbo@odoo.com> | 2015-04-16 16:15:08 +0200 |
|---|---|---|
| committer | Damien Bouvy <dbo@odoo.com> | 2015-04-22 16:47:47 +0200 |
| commit | 0d591ca6dfd6a40a2cb39014dbaf4c6c60aaa785 (patch) | |
| tree | bf84f9d354ce862c45ae1723756582a7e0702f4b /addons | |
| parent | 88260a3f2c5be17b621f1c162b06a68ad7a546c1 (diff) | |
[FIX] website_quote: accept button wasn't shown if no expiration date was set on the sale order
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/website_quote/controllers/main.py | 2 | ||||
| -rw-r--r-- | addons/website_quote/views/website_quotation.xml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/addons/website_quote/controllers/main.py b/addons/website_quote/controllers/main.py index f8dc4bad961..6b8c5059de6 100644 --- a/addons/website_quote/controllers/main.py +++ b/addons/website_quote/controllers/main.py @@ -54,7 +54,7 @@ class sale_quote(http.Controller): 'message': message and int(message) or False, 'option': bool(filter(lambda x: not x.line_id, order.options)), 'order_valid': (not order.validity_date) or (now <= order.validity_date), - 'days_valid': max(days, 0) + 'days_valid': days, } return request.website.render('website_quote.so_quotation', values) diff --git a/addons/website_quote/views/website_quotation.xml b/addons/website_quote/views/website_quotation.xml index 5059d0915e8..5646bdbc0ce 100644 --- a/addons/website_quote/views/website_quotation.xml +++ b/addons/website_quote/views/website_quotation.xml @@ -156,9 +156,9 @@ <template id="quotation_toolbar"> <div class="text-center hidden-print" t-if="quotation.state in ('draft', 'sent', 'waiting_date')"> - <a class="btn btn-success fa fa-check" data-toggle="modal" data-target="#modelaccept" - t-if="days_valid"> - Accept + <a class="btn btn-success" data-toggle="modal" data-target="#modalaccept" + t-if="days_valid >= 0"> + <i class="fa fa-check"></i> Accept </a> <a class="btn btn-info fa fa-comment" type="submit" href="#discussion"> Feedback |