[MERGE] forward port of branch 8.0 up to 2779d46

4 files changed, 4 insertions, 3 deletions

diff --git a/addons/l10n_lu/account.tax.template-2015.csv b/addons/l10n_lu/account.tax.template-2015.csv
index b3f8ec1316e..e1181aaa04d 100644
--- a/addons/l10n_lu/account.tax.template-2015.csv
+++ b/addons/l10n_lu/account.tax.template-2015.csv
@@ -395,7 +395,7 @@ lu_2011_tax_VB-PA-Tab,Vente Biens Tabacs - Pays,VB-PA-Tab,sale,percent,0.0,0,,,,
 lu_2015_tax_VB-TR-0,Vente Biens – Triangulaire Intracommunautaire,VB-TR-0,sale,percent,0.0,0,,,,1.0,,lu_tax_code_template_b_VB-TR-0,,-1.0,,lu_tax_code_template_b_VB-TR-0,,lu_2011_chart_1,494

 lu_2011_tax_VP-EC-0,Vente Prestations - Extracommunautaire,VP-EC-0,sale,percent,0.0,0,,,,1.0,1.0,lu_tax_code_template_b_VP-EC-0,,-1.0,-1.0,lu_tax_code_template_b_VP-EC-0,,lu_2011_chart_1,495

 lu_2011_tax_VP-IC-0,Vente Prestations - Intracommunautaire,VP-IC-0,sale,percent,0.0,0,,,,1.0,1.0,lu_tax_code_template_b_VP-IC-0,,-1.0,-1.0,lu_tax_code_template_b_VP-IC-0,,lu_2011_chart_1,496

-lu_2011_tax_VP-IC-EX,Vente Prestations - Intracommunautaire exonérées dans l'état membre,VP-IC-EX,sale,percent,0.0,0,,,,-1.0,-1.0,lu_tax_code_template_b_VP-IC-EX,,-1.0,-1.0,lu_tax_code_template_b_VP-IC-EX,,lu_2011_chart_1,497

+lu_2011_tax_VP-IC-EX,Vente Prestations - Intracommunautaire exonérées dans l'état membre,VP-IC-EX,sale,percent,0.0,0,,,,1.0,1.0,lu_tax_code_template_b_VP-IC-EX,,-1.0,-1.0,lu_tax_code_template_b_VP-IC-EX,,lu_2011_chart_1,497

 lu_2011_tax_VP-PA-0,Vente Prestations 0% - Pays,VP-PA-0,sale,percent,0.0,0,,,,1.0,1.0,lu_tax_code_template_b_VP-PA-0,,-1.0,-1.0,lu_tax_code_template_b_VP-PA-0,,lu_2011_chart_1,498

 lu_2011_tax_VP-PA-12,Vente Prestations 12% - Pays,VP-PA-12,sale,percent,0.12,0,,lu_2011_account_4614111,lu_2011_account_4614111,1.0,1.0,lu_tax_code_template_b_VP-PA-12,lu_tax_code_template_t_VP-PA-12,-1.0,-1.0,lu_tax_code_template_b_VP-PA-12,lu_tax_code_template_t_VP-PA-12,lu_2011_chart_1,499

 lu_2015_tax_VP-PA-14,Vente Prestations 14% - Pays,VP-PA-14,sale,percent,0.14,0,,lu_2011_account_4614111,lu_2011_account_4614111,1.0,1.0,lu_tax_code_template_b_VP-PA-14,lu_tax_code_template_t_VP-PA-14,-1.0,-1.0,lu_tax_code_template_b_VP-PA-14,lu_tax_code_template_t_VP-PA-14,lu_2011_chart_1,500

diff --git a/addons/l10n_lu/scripts/tax.xls b/addons/l10n_lu/scripts/tax.xls
index 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 4a607b6fee8..99597e2bc5f 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -315,8 +315,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,
                 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 05ee1e9b8fb..c2680b309ae 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -897,7 +897,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 &gt;= 0 else ''">
+                      <select name="shipping_state_id" class="form-control" t-att-disabled="  'disabled' if shipping_id &gt;= 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>