From 2014fabfbaf2e24a047881deb404844a81c7bbc1 Mon Sep 17 00:00:00 2001
From: Nicolas Lempereur <nle@odoo.com>
Date: Tue, 30 Jan 2018 15:01:39 +0100
Subject: [PATCH 1/5] [FIX] web_editor: firefox editor hidden mass mail

When saving a modified mass mailing, the editor will do a number of
things to improve the mail readability accross mail client.

One of those is replacing font awesome icons by image, but firefox acts
differently than other browser. On a display:none iframe, doing
.css('color') or .height() on an element returns respectively
`undefined` and 0.

This caused an error when getting the color that we could solve by
doing a fallback for firefox like this:

 window.parent.getComputedStyle($font[0]).color

But to get the height() of an element, it seems we always need the
iframe displayed.

With this change, when the iframe is hidden and the browser is firefox,
the code try to display the iframe (with "visibility:hidden;height:1px")
when this part of the code happen.

note: backport of 10.0 13c326caaa

opw-807180
closes #22701
---
 addons/web_editor/static/src/js/backend.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/addons/web_editor/static/src/js/backend.js b/addons/web_editor/static/src/js/backend.js
index 2b3c0e0790c..8677b683da5 100644
--- a/addons/web_editor/static/src/js/backend.js
+++ b/addons/web_editor/static/src/js/backend.js
@@ -407,7 +407,19 @@ var FieldTextHtml = widget.extend({
                 var layoutInfo = this.editor.rte.editable().data('layoutInfo');
                 $.summernote.pluginEvents.codeview(undefined, undefined, layoutInfo, false);
             }
+            var $ancestors = this.$iframe.filter(':not(:visible)').parentsUntil(':visible').addBack();
+            var ancestorsStyle = [];
+            // temporarily force displaying iframe (needed for firefox)
+            _.each($ancestors, function (el) {
+                var $el = $(el);
+                ancestorsStyle.unshift($el.attr('style') || null);
+                $el.css({display: 'initial', visibility: 'hidden', height: 1});
+            });
             this.editor.buildingBlock.clean_for_save();
+            _.each($ancestors, function (el) {
+                var $el = $(el);
+                $el.attr('style', ancestorsStyle.pop());
+            });
             this.internal_set_value( this.$content.html() );
         }
     },

From 76665df0cfc765483c8d2856ad9579e9d7b6b58d Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Wed, 31 Jan 2018 13:11:18 +0100
Subject: [PATCH 2/5] [FIX] website_forum: allow portal users to post replies
 to replies

Before this commit, when connected as a portal user, the user was not
able to post replies to existing replies. This is because the textarea
section was marked to be displayed for connected internal users only.
This commit removes the whole group restriction. Indeed, it makes sense
(as a fix), to show the textarea section for public users too. Indeed,
the "Reply" button is already shown to public users but does not do
anything. With this commit, clicking the "Reply" button shows the
textarea section for everybody and, if the user is not connected,
redirects to the login page when posting the message. This of course
needs usability improvements in master.

Note: the problem had originally been fixed for regular answers with
commit https://github.com/odoo/odoo/commit/b81b03c82d282dc94595a9beb94444041509ef25

Note 2: both mentioned problems were originally introduced by commit
https://github.com/odoo/odoo/commit/9069d0127c176317436b67b23ae5677dd9d53de7

Closes https://github.com/odoo/odoo/issues/22648
---
 addons/website_forum/views/website_forum.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index d6bef90930a..e06f78e4108 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -667,7 +667,7 @@
 
 <!-- Edition: post a reply -->
 <template id="post_reply">
-    <div class="css_editable_mode_hidden" groups="base.group_user">
+    <div class="css_editable_mode_hidden">
         <form t-attf-id="reply#{ object._name.replace('.','') + '-' + str(object.id) }" class="collapse js_website_submit_form"
             t-attf-action="/forum/#{ slug(forum) }/#{slug(object)}/reply" method="post" role="form">
             <h3 class="mt8">Your Reply</h3>

From dccdff2539a673c3a0f88c15ebdce849b12ffb15 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Fri, 2 Feb 2018 11:09:46 +0100
Subject: [PATCH 3/5] [FIX] purchase: purchase kit product

The issue solved with 24eee9d7ba9a6084 was introduced back with
7333f5e9b8ac89.

opw-808056
---
 addons/purchase/purchase.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 6e07b1ebddf..b051377410b 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -357,11 +357,11 @@ class PurchaseOrder(models.Model):
                 picking = self.env['stock.picking'].create(res)
                 moves = order.order_line.filtered(lambda r: r.product_id.type in ['product', 'consu'])._create_stock_moves(picking)
                 move_ids = moves.action_confirm()
+                moves = self.env['stock.move'].browse(move_ids)
                 seq = 0
                 for move in sorted(moves, key=lambda move: move.date_expected):
                     seq += 5
                     move.sequence = seq
-                moves = self.env['stock.move'].browse(move_ids)
                 moves.force_assign()
         return True
 

From dc8698132af9b5735d9729a3068951f287d2fc2e Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Fri, 2 Feb 2018 13:36:32 +0100
Subject: [PATCH 4/5] [IMP] odoo shell: set expected `__name__` for scripts
 read from stdin

Name of scripts piped to `odoo shell` were `__builtin__` (`builtins` in
python3), which is not really obvious (and awful if your script must
handle python2 and python3).

Change it to `__main__`, allowing to use to common pattern
`if __name__ == '__main__':`
---
 openerp/cli/shell.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openerp/cli/shell.py b/openerp/cli/shell.py
index 2e11645032d..76e715135cd 100644
--- a/openerp/cli/shell.py
+++ b/openerp/cli/shell.py
@@ -34,6 +34,7 @@ class Shell(Command):
 
     def console(self, local_vars):
         if not os.isatty(sys.stdin.fileno()):
+            local_vars['__name__'] = '__main__'
             exec sys.stdin in local_vars
         else:
             if 'env' not in local_vars:

From b08185fc66ab83ec3d25b00beb00633517925520 Mon Sep 17 00:00:00 2001
From: Nicolas Lempereur <nle@odoo.com>
Date: Fri, 2 Feb 2018 17:12:57 +0100
Subject: [PATCH 5/5] [FIX] product: can't search attribute value

A name_search on attribute line would possibly ends up with a domain like:

 ['|', ('attribute_id', '=', 'm'), ('value_ids', '=', 'm'),
  ('attribute_id', '=', 'm')]

which would just search the attribute.

This is caused by calling the default name_search. This commit forgo
the default name_search when we are in this attribute line special case.

courtesy-of: @fmdl

opw-813505
closes #22619
closes #22760
---
 addons/product/product.py             |  8 +++---
 addons/product/tests/__init__.py      |  2 +-
 addons/product/tests/test_variants.py | 37 +++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 addons/product/tests/test_variants.py

diff --git a/addons/product/product.py b/addons/product/product.py
index 96317ad1aca..38c57377ab4 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -364,12 +364,12 @@ class product_attribute_line(osv.osv):
         # search on a m2o and one on a m2m, probably this will quickly become
         # difficult to compute - check if performance optimization is required
         if name and operator in ('=', 'ilike', '=ilike', 'like', '=like'):
-            new_args = ['|', ('attribute_id', operator, name), ('value_ids', operator, name)]
-        else:
-            new_args = args
+            args = ['|', ('attribute_id', operator, name), ('value_ids', operator, name)]
+            ids = self.search(cr, uid, args, limit=limit, context=context)
+            return self.name_get(cr, uid, ids, context=context)
         return super(product_attribute_line, self).name_search(
             cr, uid, name=name,
-            args=new_args,
+            args=args,
             operator=operator, context=context, limit=limit)
 
 
diff --git a/addons/product/tests/__init__.py b/addons/product/tests/__init__.py
index 7c05b1bf791..962cae5c595 100644
--- a/addons/product/tests/__init__.py
+++ b/addons/product/tests/__init__.py
@@ -1 +1 @@
-from . import test_uom, test_pricelist
+from . import test_uom, test_pricelist, test_variants
diff --git a/addons/product/tests/test_variants.py b/addons/product/tests/test_variants.py
new file mode 100644
index 00000000000..83d39197d7b
--- /dev/null
+++ b/addons/product/tests/test_variants.py
@@ -0,0 +1,37 @@
+from openerp.tests.common import TransactionCase
+
+class TestVariants(TransactionCase):
+
+    def setUp(self):
+        res = super(TestVariants, self).setUp()
+        self.size_attr = self.env['product.attribute'].create({'name': 'Size'})
+        self.size_attr_value_s = self.env['product.attribute.value'].create({'name': 'S', 'attribute_id': self.size_attr.id})
+        self.size_attr_value_m = self.env['product.attribute.value'].create({'name': 'M', 'attribute_id': self.size_attr.id})
+        self.size_attr_value_l = self.env['product.attribute.value'].create({'name': 'L', 'attribute_id': self.size_attr.id})
+        self.product_shirt_template = self.env['product.template'].create({
+            'name': 'Shirt',
+            'attribute_line_ids': [(0, 0, {
+                'attribute_id': self.size_attr.id,
+                'value_ids': [(6, 0, [self.size_attr_value_l.id])],
+            })]
+        })
+        return res
+
+    def test_attribute_line_search(self):
+        search_not_to_be_found = self.env['product.template'].search(
+            [('attribute_line_ids', '=', 'M')]
+        )
+        self.assertNotIn(self.product_shirt_template, search_not_to_be_found,
+                         'Shirt should not be found searching M')
+
+        search_attribute = self.env['product.template'].search(
+            [('attribute_line_ids', '=', 'Size')]
+        )
+        self.assertIn(self.product_shirt_template, search_attribute,
+                      'Shirt should be found searching Size')
+
+        search_value = self.env['product.template'].search(
+            [('attribute_line_ids', '=', 'L')]
+        )
+        self.assertIn(self.product_shirt_template, search_value,
+                      'Shirt should be found searching L')