diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-07-31 18:52:40 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-07-31 18:52:40 +0200 |
| commit | 42e5b322af166c62f82f713087cb3c2a877965fe (patch) | |
| tree | da848fe33c907b9d258499f48860b6039b7a95c5 /addons | |
| parent | 535d50afbde7c50b74c5e4f5a35e757103e64881 (diff) | |
| parent | 0265884608b818a19a6b69f997e6ab46bd6fbbaa (diff) | |
[MERGE] forward port branch saas-14 up to 0265884608b
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/im_livechat/static/src/js/im_livechat.js | 2 | ||||
| -rw-r--r-- | addons/website_sale/models/sale_order.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/addons/im_livechat/static/src/js/im_livechat.js b/addons/im_livechat/static/src/js/im_livechat.js index 10cc5610214..f615b5b110b 100644 --- a/addons/im_livechat/static/src/js/im_livechat.js +++ b/addons/im_livechat/static/src/js/im_livechat.js @@ -313,7 +313,7 @@ var Feedback = Widget.extend({ // only display textearea if bad smiley selected var close_chat = false; - if (this.rating === 0) { + if (this.rating === 1) { this.$('.o_livechat_rating_reason').show(); } else { this.$('.o_livechat_rating_reason').hide(); diff --git a/addons/website_sale/models/sale_order.py b/addons/website_sale/models/sale_order.py index a828a612f0e..e7ca966e329 100644 --- a/addons/website_sale/models/sale_order.py +++ b/addons/website_sale/models/sale_order.py @@ -239,8 +239,8 @@ class Website(models.Model): if not pricelists: # no pricelist for this country, or no GeoIP pricelists |= all_pl.filtered(lambda pl: not show_visible or pl.selectable or pl.id in (current_pl, order_pl)) - else: - pricelists |= all_pl.filtered(lambda pl: not show_visible and pl.sudo().code) + if not show_visible and not country_code: + pricelists |= all_pl.filtered(lambda pl: pl.sudo().code) # This method is cached, must not return records! See also #8795 return pricelists.ids |