diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-06-03 11:15:10 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-06-03 11:15:10 +0200 |
| commit | 5419485e72e1537cb116ada3520edbaa8c4e931d (patch) | |
| tree | 3ad67574ea3c191303574743f5f3ce7dfb357525 | |
| parent | 5ed14ce9b0fb0babc1ed53c451aef6c9327b056e (diff) | |
| parent | d5df72929486eb5a60a0ff122fb10292cea85351 (diff) | |
[MERGE] forward port of branch saas-6 up to d5df729
| -rw-r--r-- | addons/l10n_lu/scripts/tax.xls | bin | 259072 -> 259072 bytes | |||
| -rw-r--r-- | addons/website_forum/controllers/main.py | 3 | ||||
| -rw-r--r-- | addons/website_sale/views/templates.xml | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/addons/l10n_lu/scripts/tax.xls b/addons/l10n_lu/scripts/tax.xls Binary files differindex a807833848f..0a3a0182728 100644 --- a/addons/l10n_lu/scripts/tax.xls +++ b/addons/l10n_lu/scripts/tax.xls diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py index bc79ec52ebc..7dbac19620a 100644 --- a/addons/website_forum/controllers/main.py +++ b/addons/website_forum/controllers/main.py @@ -336,8 +336,9 @@ class WebsiteForum(http.Controller): question = post.parent_id if post.parent_id else post if kwargs.get('comment') and post.forum_id.id == forum.id: # TDE FIXME: check that post_id is the question or one of its answers + body = tools.mail.plaintext2html(kwargs['comment']) post.with_context(mail_create_nosubscribe=True).message_post( - body=kwargs.get('comment'), + body=body, message_type='comment', subtype='mt_comment') return werkzeug.utils.redirect("/forum/%s/question/%s" % (slug(forum), slug(question))) diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml index f8a2256bb86..5ed52094d83 100644 --- a/addons/website_sale/views/templates.xml +++ b/addons/website_sale/views/templates.xml @@ -1082,7 +1082,7 @@ </div> <div t-attf-class="form-group #{error.get('shipping_state_id') and 'has-error' or ''} col-lg-6"> <label class="control-label label-optional" for="shipping_state_id">State / Province</label> - <select name="shipping_state_id" class="form-control" t-att-readonly=" 'readonly' if shipping_id >= 0 else ''"> + <select name="shipping_state_id" class="form-control" t-att-disabled=" 'disabled' if shipping_id >= 0 else ''"> <option value="">State / Province...</option> <t t-foreach="states or []" t-as="state"> <option t-att-value="state.id" style="display:none;" t-att-data-country_id="state.country_id.id" t-att-selected="state.id == checkout.get('shipping_state_id')"><t t-esc="state.name"/></option> |