From de11d52ad45dca674c2d75284ee854f4284a15be Mon Sep 17 00:00:00 2001
From: az-flectra <akshar@techreceptives.com>
Date: Fri, 6 Jul 2018 11:00:29 +0530
Subject: [PATCH 1/5] Added Upstream Patch for transifex

---
 addons/transifex/models/ir_translation.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/transifex/models/ir_translation.py b/addons/transifex/models/ir_translation.py
index 1252e5ef..95f49127 100644
--- a/addons/transifex/models/ir_translation.py
+++ b/addons/transifex/models/ir_translation.py
@@ -78,11 +78,14 @@ class IrTranslation(models.Model):
                     translation.transifex_url = False
                     continue
 
-                # e.g. 'https://www.transifex.com/flectra/flectra-10/translate/#fr/sale/42?q=Sale+Order'
+                # e.g. 'https://www.transifex.com/flectra/flectra-10/translate/#fr/sale/42?q=text'Sale+Order'
                 translation.transifex_url = "%(url)s/%(project)s/translate/#%(lang)s/%(module)s/42?q=%(src)s" % {
                     'url': base_url,
                     'project': project,
                     'lang': lang_code,
                     'module': translation.module,
-                    'src': werkzeug.url_quote_plus(translation.source[:50]),
+                    'src': werkzeug.url_quote_plus(
+                            "text:'" +
+                            translation.source[:50].replace("'", "\'") +
+                            "'"),
                 }

From 3712c502ce01aaf1fa38bc2925edfe828624891b Mon Sep 17 00:00:00 2001
From: az-flectra <akshar@techreceptives.com>
Date: Mon, 9 Jul 2018 16:22:54 +0530
Subject: [PATCH 2/5] Added Upstream Patch for website_forum

---
 addons/website_forum/models/forum.py                  |  5 +++++
 addons/website_forum/static/src/css/website_forum.css |  1 +
 addons/website_forum/static/src/js/website_forum.js   |  9 +++++----
 addons/website_forum/views/website_forum.xml          | 10 ++++++++--
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/addons/website_forum/models/forum.py b/addons/website_forum/models/forum.py
index 2a7caa56..ef13e3b2 100644
--- a/addons/website_forum/models/forum.py
+++ b/addons/website_forum/models/forum.py
@@ -434,6 +434,11 @@ class Post(models.Model):
                 raise KarmaError('User karma not sufficient to post an image or link.')
         return content
 
+    @api.constrains('parent_id')
+    def _check_parent_id(self):
+        if not self._check_recursion():
+            raise ValidationError(_('You cannot create recursive forum posts.'))
+
     @api.model
     def create(self, vals):
         if 'content' in vals and vals.get('forum_id'):
diff --git a/addons/website_forum/static/src/css/website_forum.css b/addons/website_forum/static/src/css/website_forum.css
index d1c350fd..d960d3c4 100644
--- a/addons/website_forum/static/src/css/website_forum.css
+++ b/addons/website_forum/static/src/css/website_forum.css
@@ -118,6 +118,7 @@ a.no-decoration {
 
 .close.comment_delete {
   font-size: 16px;
+  float: none;
 }
 
 .country_flag {
diff --git a/addons/website_forum/static/src/js/website_forum.js b/addons/website_forum/static/src/js/website_forum.js
index a7cb0309..467f648a 100644
--- a/addons/website_forum/static/src/js/website_forum.js
+++ b/addons/website_forum/static/src/js/website_forum.js
@@ -25,13 +25,14 @@ flectra.define('website_forum.website_forum', function (require) {
             if ($('a[href*="/login"]').length) {
                 msg = _t('Sorry you must be logged in to perform this action');
             }
-            var $warning = $('<div class="alert alert-danger alert-dismissable oe_forum_alert" id="karma_alert">'+
+            var $warning = $('<div class="alert alert-danger alert-dismissable oe_forum_alert mt8" id="karma_alert">'+
                 '<button type="button" class="close notification_close" data-dismiss="alert" aria-hidden="true">&times;</button>'+
                 msg + '</div>');
-            var vote_alert = $(ev.currentTarget).parent().find("#vote_alert");
-            if (vote_alert.length === 0) {
-                $(ev.currentTarget).parent().append($warning);
+            var $voteAlert = $('#karma_alert');
+            if ($voteAlert.length) {
+                $voteAlert.remove();
             }
+            $(ev.currentTarget).after($warning);
         }
     });
 
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 503e4172..47f739b9 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -30,7 +30,7 @@
 
 <!-- helper -->
 <template id="link_button">
-    <form method="POST" t-att-action="url">
+    <form method="POST" t-att-action="url" t-attf-class="#{form_classes}">
         <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
         <button t-attf-class="fa btn-link #{classes} #{karma and 'karma_required text-muted' or ''}" t-attf-data-karma="#{karma}">
             <t t-esc="label"/></button>
@@ -1096,6 +1096,7 @@
                         <t t-set="label"> </t>
                         <t t-set="karma" t-value="user.karma&lt;required_karma and required_karma or 0"/>
                         <t t-set="classes" t-value="'close comment_delete fa-times'"/>
+                        <t t-set="form_classes" t-value="'pull-right'"/>
                     </t>
 
                     <div><span t-field="message.body" class="oe_no_empty"/></div>
@@ -1108,7 +1109,8 @@
                             <t t-set="url" t-value="'/forum/' + slug(forum) + '/post/' + slug(object) + '/comment/' + slug(message) + '/convert_to_answer'"/>
                             <t t-set="label">Convert as an answer</t>
                             <t t-set="karma" t-value="user.karma&lt;required_karma and required_karma or 0"/>
-                            <t t-set="classes" t-value="'fa-magic pull-right'"/>
+                            <t t-set="classes" t-value="'fa-magic'"/>
+                            <t t-set="form_classes" t-value="'pull-right'"/>
                         </t>
                     </t>
                     <a t-attf-href="/forum/#{slug(forum)}/partner/#{message.author_id.id}"
@@ -1289,6 +1291,10 @@
 <!--Private profile-->
 <template id="private_profile">
     <t t-call="website_forum.header">
+        <t t-set='head'>
+            <t t-raw='head'/>
+            <meta name="robots" content="noindex follow"/>
+        </t>
         <h1 class="mt32">This profile is private!</h1>
         <p>
             <a t-attf-href="/forum/#{slug(forum)}">Return to the question list.</a>

From b40e3903f2c276085051eabee48e73e95f719b53 Mon Sep 17 00:00:00 2001
From: az-flectra <akshar@techreceptives.com>
Date: Mon, 9 Jul 2018 16:23:49 +0530
Subject: [PATCH 3/5] Added Upstream Patch for website_sale_delivery

---
 addons/website_sale_delivery/controllers/main.py  | 15 +++++++++++----
 addons/website_sale_delivery/models/sale_order.py |  1 +
 .../static/src/js/website_sale_delivery.js        | 10 ++++++++++
 .../views/website_sale_delivery_templates.xml     |  2 +-
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/addons/website_sale_delivery/controllers/main.py b/addons/website_sale_delivery/controllers/main.py
index 9a17a4b0..cc27639e 100644
--- a/addons/website_sale_delivery/controllers/main.py
+++ b/addons/website_sale_delivery/controllers/main.py
@@ -67,8 +67,15 @@ class WebsiteSaleDelivery(WebsiteSale):
             return {'status': order.delivery_rating_success,
                     'error_message': order.delivery_message,
                     'carrier_id': carrier_id,
-                    'new_amount_delivery': float_repr(currency.round(order.delivery_price), currency.decimal_places),
-                    'new_amount_untaxed': order.amount_untaxed,
-                    'new_amount_tax': order.amount_tax,
-                    'new_amount_total': order.amount_total,
+                    'new_amount_delivery': self._format_amount(order.delivery_price, currency),
+                    'new_amount_untaxed': self._format_amount(order.amount_untaxed, currency),
+                    'new_amount_tax': self._format_amount(order.amount_tax, currency),
+                    'new_amount_total': self._format_amount(order.amount_total, currency),
             }
+
+    def _format_amount(self, amount, currency):
+        fmt = "%.{0}f".format(currency.decimal_places)
+        lang = request.env['res.lang']._lang_get(request.env.context.get('lang') or 'en_US')
+
+        return lang.format(fmt, currency.round(amount), grouping=True, monetary=True)\
+            .replace(r' ', u'\N{NO-BREAK SPACE}').replace(r'-', u'\u2011')
diff --git a/addons/website_sale_delivery/models/sale_order.py b/addons/website_sale_delivery/models/sale_order.py
index 4d164308..42ac0c99 100644
--- a/addons/website_sale_delivery/models/sale_order.py
+++ b/addons/website_sale_delivery/models/sale_order.py
@@ -65,6 +65,7 @@ class SaleOrder(models.Model):
                         carrier = delivery
                         break
                 self.write({'carrier_id': carrier.id})
+            self._remove_delivery_line()
             if carrier:
                 self.get_delivery_price()
                 if self.delivery_rating_success:
diff --git a/addons/website_sale_delivery/static/src/js/website_sale_delivery.js b/addons/website_sale_delivery/static/src/js/website_sale_delivery.js
index ff6711bc..413ba007 100644
--- a/addons/website_sale_delivery/static/src/js/website_sale_delivery.js
+++ b/addons/website_sale_delivery/static/src/js/website_sale_delivery.js
@@ -27,6 +27,10 @@ flectra.define('website_sale_delivery.checkout', function (require) {
         else {
             console.error(result.error_message);
             $compute_badge.text(result.error_message);
+            $amount_delivery.text(result.new_amount_delivery);
+            $amount_untaxed.text(result.new_amount_untaxed);
+            $amount_tax.text(result.new_amount_tax);
+            $amount_total.text(result.new_amount_total);
         }
     };
 
@@ -40,6 +44,12 @@ flectra.define('website_sale_delivery.checkout', function (require) {
 
     var $carriers = $("#delivery_carrier input[name='delivery_type']");
     $carriers.click(_onCarrierClick);
+    // Workaround to:
+    // - update the amount/error on the label at first rendering
+    // - prevent clicking on 'Pay Now' if the shipper rating fails
+    if ($carriers.length > 0) {
+        $carriers.filter(':checked').click();
+    }
 
     /* Handle stuff */
     $(".oe_website_sale select[name='shipping_id']").on('change', function () {
diff --git a/addons/website_sale_delivery/views/website_sale_delivery_templates.xml b/addons/website_sale_delivery/views/website_sale_delivery_templates.xml
index e993002b..04fc8240 100644
--- a/addons/website_sale_delivery/views/website_sale_delivery_templates.xml
+++ b/addons/website_sale_delivery/views/website_sale_delivery_templates.xml
@@ -3,7 +3,7 @@
 
     <template id="cart_delivery" name="Delivery Costs" inherit_id="website_sale.total">
         <xpath expr="//div[@id='order_total_untaxed']" position="before">
-            <div class="row" id="order_delivery" t-if="website_sale_order and website_sale_order.has_delivery">
+            <div class="row" id="order_delivery" t-if="website_sale_order and website_sale_order.carrier_id">
                   <span class="col-xs-6 text-right text-muted" title="Delivery will be updated after choosing a new delivery method"> Delivery:</span>
                   <span class="col-xs-6 text-right-not-xs text-left-xs text-muted">
                       <span t-field="website_sale_order.amount_delivery" style="white-space: nowrap;" t-options='{

From 9d65bd343fd7831af1b11b1c4566f202d00ebcb7 Mon Sep 17 00:00:00 2001
From: az-flectra <akshar@techreceptives.com>
Date: Mon, 9 Jul 2018 16:24:28 +0530
Subject: [PATCH 4/5] Added Upstream Patch for im_livechat

---
 addons/im_livechat/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/im_livechat/controllers/main.py b/addons/im_livechat/controllers/main.py
index 740ccf4c..9f4187d4 100644
--- a/addons/im_livechat/controllers/main.py
+++ b/addons/im_livechat/controllers/main.py
@@ -16,7 +16,7 @@ class LivechatController(http.Controller):
         # _get_asset return the bundle html code (script and link list) but we want to use the attachment content
         xmlid = 'im_livechat.external_lib'
         files, remains = request.env["ir.qweb"]._get_asset_content(xmlid, options=request.context)
-        asset = AssetsBundle(xmlid, files, remains)
+        asset = AssetsBundle(xmlid, files)
 
         mock_attachment = getattr(asset, ext)()
         if isinstance(mock_attachment, list):  # suppose that CSS asset will not required to be split in pages

From b1faf35d76a85493d909ca78322c60bf0b1cab56 Mon Sep 17 00:00:00 2001
From: az-flectra <akshar@techreceptives.com>
Date: Mon, 9 Jul 2018 16:25:06 +0530
Subject: [PATCH 5/5] Added Upstream Patch for website_sale_options

---
 addons/website_sale_options/static/src/js/website_sale.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_sale_options/static/src/js/website_sale.js b/addons/website_sale_options/static/src/js/website_sale.js
index 1916c150..8b9a312e 100644
--- a/addons/website_sale_options/static/src/js/website_sale.js
+++ b/addons/website_sale_options/static/src/js/website_sale.js
@@ -9,7 +9,7 @@ require('website_sale.website_sale');
 $('.oe_website_sale #add_to_cart, .oe_website_sale #products_grid .a-submit')
     .off('click')
     .removeClass('a-submit')
-    .click(function (event) {
+    .click(_.debounce(function (event) {
         var $form = $(this).closest('form');
         var quantity = parseFloat($form.find('input[name="add_qty"]').val() || 1);
         var product_id = parseInt($form.find('input[type="hidden"][name="product_id"], input[type="radio"][name="product_id"]:checked').first().val(),10);
@@ -96,6 +96,6 @@ $('.oe_website_sale #add_to_cart, .oe_website_sale #products_grid .a-submit')
                 });
             });
         return false;
-    });
+    }, 200, true));
 
 });