From c751c129da8762c8f7b4ed599db9479d40a77f6e Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Thu, 2 Jun 2016 16:52:27 +0200 Subject: [PATCH 1/3] [FIX] website_sale: `State` select readonly in shipping info If we take the below facts: - The country select is set as disabled when Shipping is set to "Ship to the same address" - The disable property of select inputs is removed when shipping is set to `create a new address`: In `website_sale.js`: ``` $selects.attr("disabled", value <= 0 ? null : "disabled" ).prop("disabled", value <= 0 ? null : "disabled" ); ``` We can safely assume that the select input "State / Province" was supposed to be set as `disabled` in the first place, not as `readonly` Before this revision, State / Provice was greyed when choosing "Create a new address" for shipping, and selecting the United States (but the select input was still usable, though, it was just greyed) opw-675739 --- addons/website_sale/views/templates.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml index 48d2fe86aa4..1046427c30f 100644 --- a/addons/website_sale/views/templates.xml +++ b/addons/website_sale/views/templates.xml @@ -960,7 +960,7 @@
- From 30f06fd39e856a97c5aed7cff461e1bb207232bc Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 2 Jun 2016 16:02:48 +0200 Subject: [PATCH 2/3] [FIX] website_forum: convert content of posted comment to plaintext HTML content should be escaped before being sanitized. Any content (link, image, code,...) that is acceptable in usual mail.message but should not be interprated when posted on a comment of the forum. Fixes #3737 --- addons/website_forum/controllers/main.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py index 4323e03720f..95a8062e37b 100644 --- a/addons/website_forum/controllers/main.py +++ b/addons/website_forum/controllers/main.py @@ -347,9 +347,10 @@ class WebsiteForum(http.Controller): cr, uid, context = request.cr, request.uid, request.context 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']) request.registry['forum.post'].message_post( cr, uid, post.id, - body=kwargs.get('comment'), + body=body, type='comment', subtype='mt_comment', context=dict(context, mail_create_nosubscribe=True)) From 2779d463e80eaf903e789c29991a1faef8d07445 Mon Sep 17 00:00:00 2001 From: "Adrien Peiffer (ACSONE)" Date: Thu, 2 Jun 2016 17:33:21 +0200 Subject: [PATCH 3/3] [FIX] l10n_lu: Change the sign for VP-IC-EX. Was PR #12041 --- addons/l10n_lu/account.tax.template-2015.csv | 2 +- addons/l10n_lu/scripts/tax.xls | Bin 259072 -> 259072 bytes 2 files changed, 1 insertion(+), 1 deletion(-) 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 a807833848f47d1b1f8835127449539c15a196fe..0a3a0182728c35c19fbb410137fe391ee44f7f9b 100644 GIT binary patch delta 2205 zcmaLZeN0t#9LMqVJ4cc1T!G|56GR5)%Zi0$Ea4+P_ z6kQnMkIDk7mH)K4wfeOlO(n5>7$rtx2}Oklj%sVPVRr8Cea~t96YSjA+4u83zu))X zbGetA{)C$TgoEeeMCZHRaYx6BtcDhQqG)e;&rY-ahJSmvt-5WoIV&~AFb%_qi#`}* zq7V8kdSVn+Y$;WtT(Mus^I;J$5AC+b$TMM)C@k3#7Rj>yh+7y-A#sme7)PPU>$rx( zs%VE=D2DZtVv4ScsWRJHPfUaBU^>iz6qu>;r8;9yHZnwXOut&QNHqH8ZO)8h7Ht7Y zgLJ)%df;JaboQOcG=-~w9@#2NlZ-qsAS(UO-%(NK|h>CmJWS`CZL|F~nL{ zscCjr(YI_>k2jZF6YF^r8+eWfy^dk8qnwVAW?!$nM1D(bSy4elB})`~9Zg=xRywNa zXz@Dwy^bg7c#@7GuOqM3-6gCeU&Oh`?!7itS*xf@<0jU!!qc#wg)-aR%b%hCEbJiO z=EXay?}9qwb}!ze3u>rMs0_CIkj{_bWB3F<)%ZReHL8C=)CIWqbJ`BW5jYBM@C6)$ zb~p}S!dGwtPQocTtx*>e%-hr1^B00&prihs=n~F`Ff<@s_u{lB^i9**yZbz~%h>0+XICHrhPoX{) zrV(%R;_1|9KniiY8~ak7&xHTpEf<%Y&9OmeaY29!KB#uLOQ)UzLE`wZ8)s6V4Ozs+ zUOb2Tjc^n30WZFVdN#}@9`@oK>hm=!Ct|kd^O~(DSOcZ779N2|VI8c84X_c)pd3Q* z7;J(HsD#b11-3$!M%5lSC!{mo^91#<7hZq{co7<5A4q6|m*8c11@^_L01F|b(%~S)`)_{=yYUlK?h;?ba^ZnSn%SxHB)UcgT7GW%P zer;RXbyiyL-D!s3FoJgm14Zk~N-O;ZrB(hVp|X3xJH)>iQMQW! delta 4389 zcmZwK4@^~690%}o?gb)v3HSt51Rn44M^GXVQ7blEYgzV3tdS+T5ilX2q5={XUCYdW zH8Z5sACs)D+S;0|)19lOxcqUSA zH@qI2lCLh{Cbyh#PNzBD;Z)V5(+$%$4cK&G8Ng<^t%7B`k!1nPrY7sI;N8ALr>Pv8 z(~bJ6iJThlz1W$aE2`8-xuk|CbM6zhcXDr~vkv889p(b7peA~0iTO08yIBD2a%z&V z;M;wfP8*A8PS?23Zkt~p4vWL#hH$ts9BvASo5NvAI8=qh(r~yX9B#FP6c+z4UTjD+ zlI2TVd3Tyxjw^e3feQ61M6QlT&`uMuyMe6&76i81Z5CVOM%D~$EwFXK)&pw+)@qwI zad)CEVjjsY%8#Bz_tV10qjv=kJ%=wYxpGj`(ZBgB1`cWnEf`ecYwVM>^)!yqwE4p zka?qgvp>>BU(}4yv!fr_`@jwXI}Gdtw^{6n8`)7{1He86_7Sj;fgQ6gFmdmF0w#VM zzK5MmG8X1WZs5OyiN66Gp(d7>8wHUPXJ|@qfl**%)a1c(Bb`TT{6llP#sy&iQj^{a zqtPF!!PUEg^Za!l3e)I=>Uv5Ka2i6F4m)I={W(M(gi#9CnMs0ltm{*V@$(j{7fwNVpQ zszj=@7VR`8I|hu@+{n{tC(Y^dj|1BU>O^*Z)XJ$?Eu^9Ctz?o0|#Kg$N9cEyjnagrSX}_5^ zd1=GSwqWgge|~9M{#B{0kmcK+NL&n7@DllQzgb;y;Iw(p;K|~TQFF2XxGI~V#*be+7hL7kD4kOwj*OXw@%t-Z+r9JJ Z&-j6}=6Qpkkbj>uEzTFpjz7&U{D0a6b20z`