From 3579bd53bed09a6bd06ac32d8bce780937993501 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Mon, 30 Apr 2018 11:30:37 +0200
Subject: [PATCH 01/51] [FIX] hr_expense: account on expense

- Set a specific expense account on an expense product
- Send an email to the expense alias

The specific expense account is not used; a default account is used
instead.

opw-1838174
---
 addons/hr_expense/models/hr_expense.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/hr_expense/models/hr_expense.py b/addons/hr_expense/models/hr_expense.py
index 53c64c4a5ac..703429b286f 100644
--- a/addons/hr_expense/models/hr_expense.py
+++ b/addons/hr_expense/models/hr_expense.py
@@ -350,6 +350,7 @@ class HrExpense(models.Model):
             expense_description = expense_description.replace(product_code.group(), '')
             products = self.env['product.product'].search([('default_code', 'ilike', product_code.group(1))]) or default_product
             product = products.filtered(lambda p: p.default_code == product_code.group(1)) or products[0]
+        account = product.product_tmpl_id._get_product_accounts()['expense']
 
         pattern = '[-+]?(\d+(\.\d*)?|\.\d+)([eE][-+]?\d+)?'
         # Match the last occurence of a float in the string
@@ -376,6 +377,8 @@ class HrExpense(models.Model):
             'unit_amount': price,
             'company_id': employee.company_id.id,
         })
+        if account:
+            custom_values['account_id'] = account.id
         return super(HrExpense, self).message_new(msg_dict, custom_values)
 
 class HrExpenseSheet(models.Model):

From e48767fe6509c9dc5bb3c0907ad36d16c4b5b773 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Mon, 14 May 2018 16:33:55 +0200
Subject: [PATCH 02/51] [FIX] mass_mailing: force to not use a template for the
 rendering

If the user configures a default `template_id` for
the `mail.compose.message`,
this template was used by the mass mailing to render the email,
and, among others,
it therefore used the `email_to` of this email template,
to render the recipients,
and it was configured empty or something else than `object.id`,
it did not used the `active_ids` passed in the context to the
`mail.compose.message` `create` call to compute the correct
recipients

To reproduce:
 - In developer mode (?debug)
 - Open the full mail compose message
   e.g. in app sales, open a so, hit new message,
   and hit the button to open the full message composer
 - Set the template to the quotation template is not there already
 - In the debug menu of the dialog, View > Set defaults,
 - Click the radio button to all users, and the default to Use template = ...
 - Then, try to send a mass mailing. It will fail because it cannot
   compute the `email_to` values correctly because the `email_to`
   of the quotation template is empty.

opw-1840287
---
 addons/mass_mailing/models/mass_mailing.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py
index 154acd47bd8..340d4c8ccb8 100644
--- a/addons/mass_mailing/models/mass_mailing.py
+++ b/addons/mass_mailing/models/mass_mailing.py
@@ -785,6 +785,7 @@ class MassMailing(osv.Model):
                 'mass_mailing_id': mailing.id,
                 'mailing_list_ids': [(4, l.id) for l in mailing.contact_list_ids],
                 'no_auto_thread': mailing.reply_to_mode != 'thread',
+                'template_id': None,
             }
             if mailing.reply_to_mode == 'email':
                 composer_values['reply_to'] = mailing.reply_to

From 2b771757e2d02d1300400f743e9cae41dc7cf40f Mon Sep 17 00:00:00 2001
From: Toufik Benjaa <tbe@odoo.com>
Date: Mon, 14 May 2018 16:59:36 +0200
Subject: [PATCH 03/51] [FIX] crm: Access rights issues in contact merging

- When merging partners with fields restricted to certain groups which the user doesn't belong, an access error is raised.
  To avoid this, we only merge fields that are accessible by the user. We do so by using the method fields_get() that only returns the fields accessible by the current user.
---
 addons/crm/wizard/base_partner_merge.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/crm/wizard/base_partner_merge.py b/addons/crm/wizard/base_partner_merge.py
index 7af4b7487ed..f43b57fc5f7 100644
--- a/addons/crm/wizard/base_partner_merge.py
+++ b/addons/crm/wizard/base_partner_merge.py
@@ -223,7 +223,7 @@ class MergePartnerAutomatic(models.TransientModel):
         """
         _logger.debug('_update_values for dst_partner: %s for src_partners: %r', dst_partner.id, src_partners.ids)
 
-        model_fields = dst_partner._fields
+        model_fields = dst_partner.fields_get().keys()
 
         def write_serializer(item):
             if isinstance(item, models.BaseModel):
@@ -232,7 +232,8 @@ class MergePartnerAutomatic(models.TransientModel):
                 return item
         # get all fields that are not computed or x2many
         values = dict()
-        for column, field in model_fields.items():
+        for column in model_fields:
+            field = dst_partner._fields[column]
             if field.type not in ('many2many', 'one2many') and field.compute is None:
                 for item in itertools.chain(src_partners, [dst_partner]):
                     if item[column]:

From 045086839184d89e6aa11b4938d5f685ce607513 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Mon, 14 May 2018 19:54:50 +0200
Subject: [PATCH 04/51] [FIX] website: correct GeoIP Legacy compatibility

Attribute is different for country and continent objects.
---
 addons/website/geoipresolver.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website/geoipresolver.py b/addons/website/geoipresolver.py
index e95b9318eb2..24bbe723d6d 100644
--- a/addons/website/geoipresolver.py
+++ b/addons/website/geoipresolver.py
@@ -50,10 +50,10 @@ class GeoIPResolver(object):
             # Compatibility with Legacy database.
             # Some ips cannot be located to a specific country. Legacy DB used to locate them in
             # continent instead of country. Do the same to not change behavior of existing code.
-            country = r.country if r.country.geoname_id else r.continent
+            country, attr = (r.country, 'iso_code') if r.country.geoname_id else (r.continent, 'code')
             return {
                 'city': r.city.name,
-                'country_code': country.iso_code,
+                'country_code': getattr(country, attr),
                 'country_name': country.name,
                 'region': r.subdivisions[0].iso_code if r.subdivisions else None,
                 'time_zone': r.location.time_zone,

From 429bcd9464928c21b0bdc3e99280cd50bf0c36b8 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Wed, 9 May 2018 14:10:51 +0200
Subject: [PATCH 05/51] [FIX] payment_sips: special characters

The field `transactionReference` of Sips must contain only
alphanumerical characters. Previous commit 31dc6b888eeb2d787f5675 solved
the special case of several attempts to pay, but a much simpler case may
appear in v11. Paying an invoice is likely to fail since the reference
contains by default `/`.

In the previous commit, we could simply modify the common `payment`
module code. In this specific case, however, we only change the
reference if the acquirer is Sips.

opw-1841483
---
 addons/account_payment/models/payment.py  |  2 +-
 addons/payment/models/payment_acquirer.py |  4 ++++
 addons/payment_sips/models/payment.py     | 11 +++++++++++
 addons/sale_payment/models/payment.py     |  2 +-
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/addons/account_payment/models/payment.py b/addons/account_payment/models/payment.py
index 389cfa206e1..cfc90258289 100644
--- a/addons/account_payment/models/payment.py
+++ b/addons/account_payment/models/payment.py
@@ -159,7 +159,7 @@ class PaymentTransaction(models.Model):
                 'currency_id': invoice.currency_id.id,
                 'partner_id': invoice.partner_id.id,
                 'partner_country_id': invoice.partner_id.country_id.id,
-                'reference': self.get_next_reference(invoice.number),
+                'reference': self._get_next_reference(invoice.number, acquirer=acquirer),
                 'account_invoice_id': invoice.id,
             }
             if add_tx_values:
diff --git a/addons/payment/models/payment_acquirer.py b/addons/payment/models/payment_acquirer.py
index efd6573c778..98992c2a679 100644
--- a/addons/payment/models/payment_acquirer.py
+++ b/addons/payment/models/payment_acquirer.py
@@ -685,6 +685,10 @@ class PaymentTransaction(models.Model):
 
     @api.model
     def get_next_reference(self, reference):
+        return self._get_next_reference(reference)
+
+    @api.model
+    def _get_next_reference(self, reference, acquirer=None):
         ref_suffix = 1
         init_ref = reference
         while self.env['payment.transaction'].sudo().search_count([('reference', '=', reference)]):
diff --git a/addons/payment_sips/models/payment.py b/addons/payment_sips/models/payment.py
index 46464b7d60c..60e4d9f3153 100644
--- a/addons/payment_sips/models/payment.py
+++ b/addons/payment_sips/models/payment.py
@@ -4,6 +4,7 @@
 
 import json
 import logging
+import re
 from hashlib import sha256
 
 from werkzeug import urls
@@ -111,6 +112,16 @@ class AcquirerSips(models.Model):
         return self.environment == 'prod' and self.sips_prod_url or self.sips_test_url
 
 
+class PaymentTransactionSips(models.Model):
+    _inherit = 'payment.transaction'
+
+    @api.model
+    def _get_next_reference(self, reference, acquirer=None):
+        if acquirer and acquirer.provider == 'sips':
+            reference = re.sub(r'[^0-9a-zA-Z]+', 'x' , reference)
+        return super(PaymentTransactionSips, self)._get_next_reference(reference, acquirer=acquirer)
+
+
 class TxSips(models.Model):
     _inherit = 'payment.transaction'
 
diff --git a/addons/sale_payment/models/payment.py b/addons/sale_payment/models/payment.py
index 831af37550f..f710b63630f 100644
--- a/addons/sale_payment/models/payment.py
+++ b/addons/sale_payment/models/payment.py
@@ -182,7 +182,7 @@ class PaymentTransaction(models.Model):
                 'currency_id': order.pricelist_id.currency_id.id,
                 'partner_id': order.partner_id.id,
                 'partner_country_id': order.partner_id.country_id.id,
-                'reference': self.get_next_reference(order.name),
+                'reference': self._get_next_reference(order.name, acquirer=acquirer),
                 'sale_order_id': order.id,
             }
             if add_tx_values:

From 1dbeda01578734859220bcb2079a5083789ff135 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Mon, 14 May 2018 12:13:06 +0200
Subject: [PATCH 06/51] [FIX] project: sub-tasks

- Activate sub-tasks in projects
- Enter a project's tasks, click on the stat button 'Sub-tasks'
- Reload the page (F5)

A traceback occurs since `project_id` is undefined.

The fields `project_id` and `partner_id` are only defined in the context
of the stat button.

opw-1844334
---
 addons/project/models/project.py       | 14 ++++++++++++++
 addons/project/views/project_views.xml | 12 +-----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/addons/project/models/project.py b/addons/project/models/project.py
index d25de3f6ab4..b00b160ae2b 100644
--- a/addons/project/models/project.py
+++ b/addons/project/models/project.py
@@ -877,6 +877,20 @@ class Task(models.Model):
             'type': 'ir.actions.act_window'
         }
 
+    def action_subtask(self):
+        action = self.env.ref('project.project_task_action_sub_task').read()[0]
+        ctx = self.env.context.copy()
+        ctx.update({
+            'default_parent_id' : self.id,
+            'default_project_id' : self.env.context.get('project_id', self.subtask_project_id.id),
+            'default_name' : self.env.context.get('name', self.name) + ':',
+            'default_partner_id' : self.env.context.get('partner_id', self.partner_id.id),
+            'search_default_project_id': self.env.context.get('project_id', self.subtask_project_id.id),
+        })
+        action['context'] = ctx
+        action['domain'] = [('id', 'child_of', self.id), ('id', '!=', self.id)]
+        return action
+
 
 class AccountAnalyticAccount(models.Model):
     _inherit = 'account.analytic.account'
diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml
index 9ebcef69138..bf1e63a5599 100644
--- a/addons/project/views/project_views.xml
+++ b/addons/project/views/project_views.xml
@@ -84,16 +84,6 @@
             <field name="name">Sub-tasks</field>
             <field name="res_model">project.task</field>
             <field name="view_mode">kanban,tree,form,calendar,pivot,graph</field>
-            <field name="domain">[('id', 'child_of', active_id), ('id', '!=', active_id)]</field>
-            <field name="context">
-            {
-                'default_parent_id' : active_id,
-                'default_project_id' : project_id,
-                'default_name' : name + ':',
-                'default_partner_id' : partner_id,
-                'search_default_project_id': [project_id],
-            }
-            </field>
             <field name="search_view_id" ref="project.view_task_search_form"/>
         </record>
 
@@ -403,7 +393,7 @@
                     <sheet string="Task">
                     <div class="oe_button_box" name="button_box">
                         <button class="oe_stat_button" icon="fa-tasks" type="object" name="action_open_parent_task" string="Parent Task" attrs="{'invisible' : [('parent_id', '=', False)]}" groups="project.group_subtask_project"/>
-                        <button name="%(project_task_action_sub_task)d" type="action" class="oe_stat_button" icon="fa-tasks"
+                        <button name="action_subtask" type="object" class="oe_stat_button" icon="fa-tasks"
                             attrs="{'invisible' : [('parent_id', '!=', False)]}"
                             context="{'project_id': subtask_project_id, 'name': name, 'partner_id': partner_id}" groups="project.group_subtask_project">
                             <field string="Sub-tasks" name="subtask_count" widget="statinfo"/>

From d9fc5bca7ecc6cdb5b1cc5242d79c429deabac27 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Mon, 14 May 2018 17:08:24 +0200
Subject: [PATCH 07/51] [FIX] purchase: move with zero qty

- Create a product FIFO / Real-Time valuation
- Create a PO with 1 unit, validate, receive the picking
- Create the corresponding vendor bill, but do not validate
- Unlock the picking and change the received quantity to 0.0
- Validate the invoice

A traceback because of a zero division occurs.

When searching for the stock moves linked to the PO, we should filter
out the ones with a zero quantity.

opw-1843543
---
 addons/purchase/models/account_invoice.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/purchase/models/account_invoice.py b/addons/purchase/models/account_invoice.py
index afd44e5f7db..23b3386fa9d 100644
--- a/addons/purchase/models/account_invoice.py
+++ b/addons/purchase/models/account_invoice.py
@@ -161,7 +161,10 @@ class AccountInvoice(models.Model):
                         #for average/fifo/lifo costing method, fetch real cost price from incomming moves
                         valuation_price_unit = i_line.purchase_line_id.product_uom._compute_price(i_line.purchase_line_id.price_unit, i_line.uom_id)
                         stock_move_obj = self.env['stock.move']
-                        valuation_stock_move = stock_move_obj.search([('purchase_line_id', '=', i_line.purchase_line_id.id), ('state', '=', 'done')])
+                        valuation_stock_move = stock_move_obj.search([
+                            ('purchase_line_id', '=', i_line.purchase_line_id.id),
+                            ('state', '=', 'done'), ('product_qty', '!=', 0.0)
+                        ])
                         if self.type == 'in_refund':
                             valuation_stock_move = valuation_stock_move.filtered(lambda m: m._is_out())
                         elif self.type == 'in_invoice':

From 871387ca9e20ac06798ab32c4ae976300a66c653 Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Mon, 14 May 2018 17:21:35 +0200
Subject: [PATCH 08/51] [FIX] web: Impossible to add an attachment on Safari

Fine tuning of cd6150fe9e63d7785f140ea1e2b3090bb1a2e10b

opw:1840373
---
 addons/web/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 03f73d8f947..d6c007f8f83 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1116,7 +1116,7 @@ class Binary(http.Controller):
             if request.httprequest.user_agent.browser == 'safari':
                 # Safari sends NFD UTF-8 (where é is composed by 'e' and [accent])
                 # we need to send it the same stuff, otherwise it'll fail
-                filename = unicodedata.normalize('NFD', ufile.filename).encode('UTF-8')
+                filename = unicodedata.normalize('NFD', ufile.filename)
 
             try:
                 attachment = Model.create({

From c39d40f98d4b27adfe0c5ca51d0373e44f176f32 Mon Sep 17 00:00:00 2001
From: Nicolas Lempereur <nle@odoo.com>
Date: Mon, 14 May 2018 13:14:04 +0200
Subject: [PATCH 09/51] [FIX] hr_recruitment: job stages choosen manually

In 9.0, stages of a job position in recruitment are not share by
default, there is a "New" stage and existing stages can be added in the
form view (since 780f46ae).

When creating a job position, the "New" is not working with the given
widget type.

This commit doesn't show stages in the form view until the record is
created.

opw-1839217
closes #24706
---
 addons/hr_recruitment/views/hr_recruitment_views.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/hr_recruitment/views/hr_recruitment_views.xml b/addons/hr_recruitment/views/hr_recruitment_views.xml
index 73276d83556..f66ca6224bd 100644
--- a/addons/hr_recruitment/views/hr_recruitment_views.xml
+++ b/addons/hr_recruitment/views/hr_recruitment_views.xml
@@ -408,7 +408,9 @@
                     <field name="address_id" context="{'show_address': 1}" domain= "[('is_company', '=', True )]" options="{'always_reload': True}"/>
                 </group>
                 <group colspan="2">
-                    <field name="stage_ids" widget="many2many_tags" options="{'no_create': True}" />
+                    <!-- ONLY FOR 9.0 -->
+                    <field name="id" invisible="1"/>
+                    <field name="stage_ids" widget="many2many_tags" options="{'no_create': True}" attrs="{'invisible': [('id', '=', False)]}"/>
                 </group>
             </group>
             <xpath expr="//field[@name='department_id']" position="after">

From e8061518823f8e10af872a8849f75ecaf0a4530e Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Mon, 14 May 2018 15:32:24 +0200
Subject: [PATCH 10/51] [FIX] point_of_sale: product not available in POS if
 not salable

When the box "Can be sold" on product.template is unticked, the
product must be unavailable in the point of sale.

Closes #22061
opw:1844188
---
 addons/point_of_sale/models/product.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/point_of_sale/models/product.py b/addons/point_of_sale/models/product.py
index e1a85cd7c4a..1caded3870e 100644
--- a/addons/point_of_sale/models/product.py
+++ b/addons/point_of_sale/models/product.py
@@ -21,6 +21,11 @@ class ProductTemplate(models.Model):
                 raise UserError(_('You cannot delete a product saleable in point of sale while a session is still opened.'))
         return super(ProductTemplate, self).unlink()
 
+    @api.onchange('sale_ok')
+    def _onchange_sale_ok(self):
+        if not self.sale_ok:
+            self.available_in_pos = False
+
 
 class ProductUomCateg(models.Model):
     _inherit = 'product.uom.categ'

From 19878d011f8abdc737b7b702c4c79632670d4b78 Mon Sep 17 00:00:00 2001
From: RomainLibert <rli@odoo.com>
Date: Mon, 14 May 2018 15:51:51 +0200
Subject: [PATCH 11/51] [FIX] event: fix bug with users

We need to fix a problem with the users where someone might get
informations on registrations.
---
 addons/event/security/ir.model.access.csv     | 4 ++--
 addons/website_event/controllers/main.py      | 2 +-
 addons/website_event_sale/controllers/main.py | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/event/security/ir.model.access.csv b/addons/event/security/ir.model.access.csv
index 8801c173f17..35f82422352 100644
--- a/addons/event/security/ir.model.access.csv
+++ b/addons/event/security/ir.model.access.csv
@@ -5,8 +5,8 @@ access_event_event,event.event,model_event_event,event.group_event_user,1,1,1,1
 access_event_registration,event.registration,model_event_registration,event.group_event_user,1,1,1,1
 access_report_event_registration,report.event.registration,model_report_event_registration,event.group_event_user,1,1,1,1
 access_event_event_portal,event.event,model_event_event,,1,0,0,0
-access_event_registration_portal,event.registration,model_event_registration,,1,0,0,0
+access_event_registration_portal,event.registration,model_event_registration,,0,0,0,0
 access_event_mail,event.mail,model_event_mail,event.group_event_user,1,0,0,0
 access_event_mail_manager,event.mail manager,model_event_mail,event.group_event_manager,1,1,1,1
 access_event_mail_registration,event.mail.registration,model_event_mail_registration,event.group_event_user,1,0,0,0
-access_event_mail_registration_manager,event.mail.registration.manager,model_event_mail_registration,event.group_event_manager,1,1,1,1
\ No newline at end of file
+access_event_mail_registration_manager,event.mail.registration.manager,model_event_mail_registration,event.group_event_manager,1,1,1,1
diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index 6df93deca78..42ce0f704c3 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -286,7 +286,7 @@ class website_event(http.Controller):
                     Registration._prepare_attendee_values(cr, uid, registration),
                     context=context))
 
-        attendees = Registration.browse(cr, uid, registration_ids, context=context)
+        attendees = Registration.browse(cr, uid, registration_ids, context=context).sudo()
         return request.website.render("website_event.registration_complete", {
             'attendees': attendees,
             'event': event,
diff --git a/addons/website_event_sale/controllers/main.py b/addons/website_event_sale/controllers/main.py
index 99681dcb4a5..c9bae3a52a9 100644
--- a/addons/website_event_sale/controllers/main.py
+++ b/addons/website_event_sale/controllers/main.py
@@ -48,7 +48,7 @@ class website_event(website_event):
         # free tickets -> order with amount = 0: auto-confirm, no checkout
         if not order.amount_total:
             order.action_confirm()  # tde notsure: email sending ?
-            attendees = request.registry['event.registration'].browse(cr, uid, list(attendee_ids), context=context)
+            attendees = request.registry['event.registration'].browse(cr, uid, list(attendee_ids), context=context).sudo()
             # clean context and session, then redirect to the confirmation page
             request.website.sale_reset(context=context)
             return request.website.render("website_event.registration_complete", {

From eb6714f59bdf79e660dbf93f7605be4c1faadad9 Mon Sep 17 00:00:00 2001
From: "Lucas Perais (lpe)" <lpe@odoo.com>
Date: Wed, 2 May 2018 10:45:59 +0200
Subject: [PATCH 12/51] [FIX] website_slides: slide in fullscreen needs to have
 the navbar

Display a slide, enter fullscreen mode
Make the navigation bar appear.

Now, try to push on any button of the nav bar

Before this commit, none of the button work
This is because the fullscreen mode is handled by the browser, and won't let any non-fullscreen
elements be interactive

After this commit, the nav bar is part of the element that are in fullscreen
And the button work

OPW 1839503
closes #24522
---
 .../static/lib/pdfslidesviewer/PDFSlidesViewer.js  | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/addons/website_slides/static/lib/pdfslidesviewer/PDFSlidesViewer.js b/addons/website_slides/static/lib/pdfslidesviewer/PDFSlidesViewer.js
index d5e7266930c..f313a37dfa3 100644
--- a/addons/website_slides/static/lib/pdfslidesviewer/PDFSlidesViewer.js
+++ b/addons/website_slides/static/lib/pdfslidesviewer/PDFSlidesViewer.js
@@ -147,12 +147,22 @@ var PDFSlidesViewer = (function(){
 
     PDFSlidesViewer.prototype.toggleFullScreenFooter = function(){
         if(document.fullscreenElement || document.mozFullScreenElement || document.webkitFullscreenElement || document.msFullscreenElement) {
-            $('div#PDFViewer > div.navbar-fixed-bottom').toggleClass('oe_show_footer');
+            var $navBarFooter = $('div#PDFViewer > div.navbar-fixed-bottom');
+            $navBarFooter.toggleClass('oe_show_footer');
+
+            if ($navBarFooter.css('display') === 'none') {
+                $navBarFooter.css('display', 'block');
+                $('div#PDFViewer').css('padding-bottom', '50px');
+            } else {
+                $navBarFooter.css('display', 'none');
+                $('div#PDFViewer').css('padding-bottom', '0');
+            }
         }
     }
 
     PDFSlidesViewer.prototype.toggleFullScreen = function(){
-        var el = this.canvas.parentNode;
+        // The canvas and the navigation bar needs to be fullscreened
+        var el = this.canvas.parentNode.parentNode;
 
         var isFullscreenAvailable = document.fullscreenEnabled || document.mozFullScreenEnabled || document.webkitFullscreenEnabled || document.msFullscreenEnabled || false;
         if(isFullscreenAvailable){ // Full screen supported

From 6de803645e9802019f122ac7e5d9abd18a71e742 Mon Sep 17 00:00:00 2001
From: RomainLibert <rli@odoo.com>
Date: Tue, 15 May 2018 12:27:19 +0200
Subject: [PATCH 13/51] [FIX] hr_holidays: remove duplicate onchange

There were two onchange methods on employee_id in hr.holiday.
---
 addons/hr_holidays/models/hr_holidays.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/addons/hr_holidays/models/hr_holidays.py b/addons/hr_holidays/models/hr_holidays.py
index 907d5f8c36b..4059d21e080 100644
--- a/addons/hr_holidays/models/hr_holidays.py
+++ b/addons/hr_holidays/models/hr_holidays.py
@@ -213,11 +213,6 @@ class Holidays(models.Model):
     double_validation = fields.Boolean('Apply Double Validation', related='holiday_status_id.double_validation')
     can_reset = fields.Boolean('Can reset', compute='_compute_can_reset')
 
-    @api.onchange('employee_id')
-    def _onchange_employee_id(self):
-        self.manager_id = self.employee_id and self.employee_id.parent_id
-        self.department_id = self.employee_id.department_id
-
     @api.multi
     @api.depends('number_of_days_temp', 'type')
     def _compute_number_of_days(self):
@@ -279,7 +274,8 @@ class Holidays(models.Model):
             self.employee_id = None
 
     @api.onchange('employee_id')
-    def _onchange_employee(self):
+    def _onchange_employee_id(self):
+        self.manager_id = self.employee_id and self.employee_id.parent_id
         self.department_id = self.employee_id.department_id
 
     def _get_number_of_days(self, date_from, date_to, employee_id):

From 4412cb0bf469f8c315fb9e8bc0a5e7af47433c41 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@odoo.com>
Date: Tue, 15 May 2018 11:02:41 +0200
Subject: [PATCH 14/51] [IMP] tests: do not warn about margins and improve
 logging

 * margin have been recently added on some query count tests as currently query
   count is not completely deterministic. Setting a warning is not really
   interesting as it is the current behavior. Being in margin is now green
   and solely provide a different logging message;
 * logged messages are improved to ease grep;

This also reverts aae54ecc159d109a044fbaa8151f1104897f2203 .

Co-authored-by: Thibault Delavallee <tde@odoo.com>
Co-authored-by: Raphael Collet <rco@odoo.com>
---
 addons/test_mail/tests/test_performance.py |  2 +-
 odoo/tests/common.py                       | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/test_mail/tests/test_performance.py b/addons/test_mail/tests/test_performance.py
index a14b55186aa..d6e272bf0aa 100644
--- a/addons/test_mail/tests/test_performance.py
+++ b/addons/test_mail/tests/test_performance.py
@@ -160,7 +160,7 @@ class TestAdvMailPerformance(TransactionCase):
             'default_res_model': 'mail.test.activity',
         })
 
-        with self.assertQueryCount(margin=1, admin=47, emp=53):  # com runbot 47 - 53 // test_mail only: 35 - 41
+        with self.assertQueryCount(margin=1, admin=46, emp=52):  # com runbot 46 - 52 // test_mail only: 35 - 41
             activity = MailActivity.create({
                 'summary': 'Test Activity',
                 'res_id': record.id,
diff --git a/odoo/tests/common.py b/odoo/tests/common.py
index 17ee4a29bf5..53efa5d458d 100644
--- a/odoo/tests/common.py
+++ b/odoo/tests/common.py
@@ -211,16 +211,16 @@ class BaseCase(TreeCase, MetaCase('DummyCase', (object,), {})):
             yield
             count = self.cr.sql_log_count - count0
             if count > (expected + margin):
-                msg = "Too much query count: user %s: got %d instead of %d (margin %s)"
-                self.fail(msg % (login, count, expected, margin))
+                msg = "Query count beyond margin for user %s: %d > %d"
+                self.fail(msg % (login, count, expected + margin))
             elif count > expected and count <= (expected + margin):
                 logger = logging.getLogger(type(self).__module__)
-                msg = "Query count greater but still in margin : user %s: got %d instead of %d (margin %s)"
-                logger.warn(msg, login, count, expected, margin)
+                msg = "Query count within margin for user %s: %d > %d (margin %s)"
+                logger.info(msg, login, count, expected, margin)
             elif count < expected:
                 logger = logging.getLogger(type(self).__module__)
-                msg = "Better query count: user %s: got %d instead of %d (margin %s)"
-                logger.info(msg, login, count, expected, margin)
+                msg = "Query count less than expected for user %s: %d < %d"
+                logger.info(msg, login, count, expected)
         else:
             yield
 

From 96e54550797a56d5ac33338ee5a9401e7cf299b3 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Tue, 15 May 2018 13:03:53 +0200
Subject: [PATCH 15/51] [FIX] hr_attendance: compute attendance state as sudo()

Since `last_attendance_id` is stored, `sudo` is needed as employees
doesn't have access to their collegues attendances.
---
 addons/hr_attendance/models/hr_employee.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/hr_attendance/models/hr_employee.py b/addons/hr_attendance/models/hr_employee.py
index 3f7eee536cf..e0cec9681bc 100644
--- a/addons/hr_attendance/models/hr_employee.py
+++ b/addons/hr_attendance/models/hr_employee.py
@@ -54,7 +54,8 @@ class HrEmployee(models.Model):
     @api.depends('last_attendance_id.check_in', 'last_attendance_id.check_out', 'last_attendance_id')
     def _compute_attendance_state(self):
         for employee in self:
-            employee.attendance_state = employee.last_attendance_id and not employee.last_attendance_id.check_out and 'checked_in' or 'checked_out'
+            att = employee.last_attendance_id.sudo()
+            employee.attendance_state = att and not att.check_out and 'checked_in' or 'checked_out'
 
     @api.constrains('pin')
     def _verify_pin(self):

From d5cf6be26e3c09e2537e473d1c8c03c794042e89 Mon Sep 17 00:00:00 2001
From: qdp-odoo <qdp@odoo.com>
Date: Tue, 2 May 2017 11:36:47 +0200
Subject: [PATCH 16/51] [IMP] account: make currency_exchange_journal_id field
 visible in settings

---
 addons/account/models/res_config.py      | 6 ++++++
 addons/account/views/res_config_view.xml | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/addons/account/models/res_config.py b/addons/account/models/res_config.py
index 906e8f95012..537a945c6df 100644
--- a/addons/account/models/res_config.py
+++ b/addons/account/models/res_config.py
@@ -14,6 +14,12 @@ class AccountConfigSettings(models.TransientModel):
         default=lambda self: self.env.user.company_id)
     currency_id = fields.Many2one('res.currency', related="company_id.currency_id", required=True,
         string='Currency', help="Main currency of the company.")
+    currency_exchange_journal_id = fields.Many2one(
+        'account.journal',
+        related='company_id.currency_exchange_journal_id',
+        string="Exchange Gain or Loss Journal",
+        domain=[('type', '=', 'general')],
+        help='The accounting journal where automatic exchange differences will be registered')
     has_chart_of_accounts = fields.Boolean(compute='_compute_has_chart_of_accounts', string='Company has a chart of accounts')
     chart_template_id = fields.Many2one('account.chart.template', string='Template',
         domain="[('visible','=', True)]")
diff --git a/addons/account/views/res_config_view.xml b/addons/account/views/res_config_view.xml
index aae1e500f73..7e7eb4c7ee0 100644
--- a/addons/account/views/res_config_view.xml
+++ b/addons/account/views/res_config_view.xml
@@ -128,6 +128,10 @@
                                         <div class="mt16">
                                             <button name="%(base.action_currency_form_company)d" icon="fa-arrow-right" type="action" string="Currencies" class="btn-link"/>
                                         </div>
+                                        <div class="row mt16">
+                                            <label for="currency_exchange_journal_id" class="col-md-3 o_light_label"/>
+                                            <field name="currency_exchange_journal_id"/>
+                                        </div>
                                     </div>
                                 </div>
                             </div>

From 6558d52e9b5dd774145d2df3822dcea8a35f7872 Mon Sep 17 00:00:00 2001
From: qdp-odoo <qdp@odoo.com>
Date: Tue, 15 May 2018 16:30:05 +0200
Subject: [PATCH 17/51] [FIX] account: adjustment wizard usability

This commits removes a disambiguation on the choices of the 'Adjustment Type' selection as 'in your favor' could be achieved by debitting the 'Collected Tax' account or creditting the 'Paid Tax' accounts (respectively for 'in favor of the Estate'). The choices now refers directly to the journal item where the tax is gonna be copied

Related to https://github.com/odoo/odoo/commit/c58ef14a01f600d75391f2a9c38bb2b30e0e2528
Related to OPW 1826242
---
 addons/account/wizard/wizard_tax_adjustments.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/wizard/wizard_tax_adjustments.py b/addons/account/wizard/wizard_tax_adjustments.py
index 22d2235ef04..05f893722a0 100644
--- a/addons/account/wizard/wizard_tax_adjustments.py
+++ b/addons/account/wizard/wizard_tax_adjustments.py
@@ -18,7 +18,7 @@ class TaxAdjustments(models.TransientModel):
     debit_account_id = fields.Many2one('account.account', string='Debit account', required=True, domain=[('deprecated', '=', False)])
     credit_account_id = fields.Many2one('account.account', string='Credit account', required=True, domain=[('deprecated', '=', False)])
     amount = fields.Monetary(currency_field='company_currency_id', required=True)
-    adjustment_type = fields.Selection([('debit', 'Adjustment in favor of the Estate'), ('credit', 'Adjustment in your favor')], string="Adjustment Type", store=False, required=True)
+    adjustment_type = fields.Selection([('debit', 'Applied on debit journal item'), ('credit', 'Applied on credit journal item')], string="Adjustment Type", store=False, required=True)
     company_currency_id = fields.Many2one('res.currency', readonly=True, default=lambda self: self.env.user.company_id.currency_id)
     tax_id = fields.Many2one('account.tax', string='Adjustment Tax', ondelete='restrict', domain=[('type_tax_use', '=', 'none'), ('tax_adjustment', '=', True)], required=True)
 

From 84f0b4d9345a6c891e7cea63a55716f325b22e1e Mon Sep 17 00:00:00 2001
From: Toufik Benjaa <tbe@odoo.com>
Date: Tue, 15 May 2018 15:43:07 +0200
Subject: [PATCH 18/51] [FIX] mail: Avoid crashing when removing link from
 chatter

- The code to remove mentionned users on the chatter isn't robust enough.
  It crashes when trying to remove a link added from a copy/paste as if it was a mention.
  Mentions have an id defined on their "a" html node, linked copied and pasted don't.
  Which crashes the javascript code because it is trying to use the id.

  This fix, make sure to delete the node without using its id (we already have the node) and make sure to remove it only if it starts with a '@' (meaning it is a mention).
---
 addons/mail/static/src/js/composer.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/mail/static/src/js/composer.js b/addons/mail/static/src/js/composer.js
index 8354fe610b5..45958a620f6 100644
--- a/addons/mail/static/src/js/composer.js
+++ b/addons/mail/static/src/js/composer.js
@@ -745,8 +745,9 @@ var BasicComposer = Widget.extend({
     },
     // remove mention when user try to edit or remove it.
     _removeMention: function (event) {
-        if (window.getSelection().anchorNode.parentNode.tagName === 'A') {
-            document.getElementById(window.getSelection().anchorNode.parentNode.id).remove();
+        var anchorNode = window.getSelection().anchorNode;
+        if (anchorNode.textContent.startsWith('@') && anchorNode.parentNode.tagName === 'A') {
+            anchorNode.parentNode.remove();
         }
     },
 

From 35c2a74480cf06849f561abcc27c5c9021b28151 Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Tue, 15 May 2018 13:28:32 +0200
Subject: [PATCH 19/51] [FIX] delivery: Delivery method name not translated

When adding a SO line with a delivery method (e.g. The Post) for a customer
with a different language that the one set on the current language, the description
of the SO line was not translated. Inspired from function 'product_id_change' in
model 'sale.order.line'

opw:1843934
---
 addons/delivery/models/sale_order.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/delivery/models/sale_order.py b/addons/delivery/models/sale_order.py
index 184374020af..cea84ee491c 100644
--- a/addons/delivery/models/sale_order.py
+++ b/addons/delivery/models/sale_order.py
@@ -89,9 +89,10 @@ class SaleOrder(models.Model):
             taxes_ids = self.fiscal_position_id.map_tax(taxes, carrier.product_id, self.partner_id).ids
 
         # Create the sales order line
+        carrier_name = carrier.product_id.with_context(lang=self.partner_id.lang).name_get()[0][1]
         values = {
             'order_id': self.id,
-            'name': carrier.name,
+            'name': carrier_name,
             'product_uom_qty': 1,
             'product_uom': carrier.product_id.uom_id.id,
             'product_id': carrier.product_id.id,

From e5fb990db1d6216a156617e387d85d13c1a0b93c Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Tue, 15 May 2018 17:07:44 +0200
Subject: [PATCH 20/51] [FIX] project: prevent to create recursive hierarchy of
 tasks

Until this revision,
this was possible to set as parent task the current task.

From then, it was impossible to compute the field
`subtask_count` because of an infinite loop.

This resulted to the inability to open the task
form, which contains this field.

opw-1847982
---
 addons/project/i18n/project.pot  | 6 ++++++
 addons/project/models/project.py | 8 +++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot
index 101c95cdd82..79618e19e4a 100644
--- a/addons/project/i18n/project.pot
+++ b/addons/project/i18n/project.pot
@@ -1573,6 +1573,12 @@ msgstr ""
 msgid "Ending Date"
 msgstr ""
 
+#. module: project
+#: code:addons/project/models/project.py:556
+#, python-format
+msgid "Error! You cannot create recursive hierarchy of task(s)."
+msgstr ""
+
 #. module: project
 #: sql_constraint:project.project:0
 msgid "Error! project start-date must be lower than project end-date."
diff --git a/addons/project/models/project.py b/addons/project/models/project.py
index b00b160ae2b..2798faaf12a 100644
--- a/addons/project/models/project.py
+++ b/addons/project/models/project.py
@@ -4,7 +4,7 @@
 from lxml import etree
 
 from odoo import api, fields, models, tools, SUPERUSER_ID, _
-from odoo.exceptions import UserError, AccessError
+from odoo.exceptions import UserError, AccessError, ValidationError
 from odoo.tools.safe_eval import safe_eval
 
 
@@ -549,6 +549,12 @@ class Task(models.Model):
         for task in self:
             task.subtask_count = self.search_count([('id', 'child_of', task.id), ('id', '!=', task.id)])
 
+    @api.constrains('parent_id')
+    def _check_parent_id(self):
+        for task in self:
+            if not task._check_recursion():
+                raise ValidationError(_('Error! You cannot create recursive hierarchy of task(s).'))
+
     @api.constrains('parent_id')
     def _check_subtask_project(self):
         for task in self:

From 04ce6e84c2c1fa5f33b3398ad3957d1b65d92456 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Fri, 11 May 2018 15:14:18 +0200
Subject: [PATCH 21/51] [IMP] website_event: show physical event before online
 if country specific.

If a country is specified, we show also all our online events to promote it since
they can be followed from anywhere. But we show in priority the physical event.

opw-1845012
---
 addons/event/models/event.py             | 5 +++++
 addons/website_event/controllers/main.py | 8 +++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/addons/event/models/event.py b/addons/event/models/event.py
index 8551c6ec389..faa4466b7c7 100644
--- a/addons/event/models/event.py
+++ b/addons/event/models/event.py
@@ -220,6 +220,11 @@ class EventEvent(models.Model):
         else:
             self.date_end_located = False
 
+    @api.onchange('is_online')
+    def _onchange_is_online(self):
+        if self.is_online:
+            self.address_id = False
+
     @api.onchange('event_type_id')
     def _onchange_type(self):
         if self.event_type_id:
diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index b9c08b8232e..38bd5b0ce7f 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -62,7 +62,6 @@ class WebsiteEventController(http.Controller):
         ]
 
         # search domains
-        # TDE note: WTF ???
         current_date = None
         current_type = None
         current_country = None
@@ -117,9 +116,12 @@ class WebsiteEventController(http.Controller):
             step=step,
             scope=5)
 
-        order = 'website_published desc, date_begin'
+        order = 'date_begin'
         if searches.get('date', 'all') == 'old':
-            order = 'website_published desc, date_begin desc'
+            order = 'date_begin desc'
+        if searches["country"] != 'all':   # if we are looking for a specific country
+            order = 'is_online, ' + order  # show physical events first
+        order = 'website_published desc, ' + order
         events = Event.search(dom_without("none"), limit=step, offset=pager['offset'], order=order)
 
         values = {

From 05ef2f24e08a06d586f9dc390878ecd3c069042f Mon Sep 17 00:00:00 2001
From: Toufik Benjaa <tbe@odoo.com>
Date: Tue, 15 May 2018 17:53:22 +0200
Subject: [PATCH 22/51] [FIX] mail: Missing parenthesis to call "remove" on
 chatter spinner

- The code to remove the loading spinner from the chatter was missing parenthesis to actually do the function call.
---
 addons/mail/static/src/js/chatter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/chatter.js b/addons/mail/static/src/js/chatter.js
index dfc041325d9..7d9f324042d 100644
--- a/addons/mail/static/src/js/chatter.js
+++ b/addons/mail/static/src/js/chatter.js
@@ -247,7 +247,7 @@ var Chatter = Widget.extend({
         }).always(function () {
             // disable widgets in create mode, otherwise enable
             self.isCreateMode ? self._disableChatter() : self._enableChatter();
-            $spinner.remove;
+            $spinner.remove();
         });
     },
     /**

From fb17edd0b0d5c956f6991feabfa704566fa0a11b Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Tue, 15 May 2018 19:19:51 +0200
Subject: [PATCH 23/51] [FIX] event_sale: update registrations as sudo.

Consequence of 19878d011f8abdc737b7b702c4c79632670d4b78
---
 addons/event_sale/models/sale_order.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event_sale/models/sale_order.py b/addons/event_sale/models/sale_order.py
index 7a2dcd8a745..6902d8e4743 100644
--- a/addons/event_sale/models/sale_order.py
+++ b/addons/event_sale/models/sale_order.py
@@ -41,7 +41,7 @@ class SaleOrderLine(models.Model):
         order line has a product_uom_qty attribute that will be the number of
         registrations linked to this line. This method update existing registrations
         and create new one for missing one. """
-        Registration = self.env['event.registration']
+        Registration = self.env['event.registration'].sudo()
         registrations = Registration.search([('sale_order_line_id', 'in', self.ids), ('state', '!=', 'cancel')])
         for so_line in self.filtered('event_id'):
             existing_registrations = registrations.filtered(lambda self: self.sale_order_line_id.id == so_line.id)

From 25548eb7e963632668438f939401403431201904 Mon Sep 17 00:00:00 2001
From: len-odoo <len@odoo.com>
Date: Fri, 11 May 2018 16:59:10 +0200
Subject: [PATCH 24/51] [FIX] web: sort relational fields by their names

When sorting records according to a many2one field in a list view
embedded in a form view, the js would sort according to their ids,
in a seemingly arbitrary order.
Thus sorting records according to a field with values in ("a", "b", "c")
could be sorted as "a", "a", "c", "b" instead of "a", "a", "b", "c".
We make the comparison on the name of the field instead.

opw 1838860
---
 .../static/src/js/views/basic/basic_model.js  | 14 ++++++-
 .../tests/fields/relational_fields_tests.js   | 37 +++++++++++++++++++
 2 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/views/basic/basic_model.js b/addons/web/static/src/js/views/basic/basic_model.js
index 9e8afe1629f..d0eed4dc524 100644
--- a/addons/web/static/src/js/views/basic/basic_model.js
+++ b/addons/web/static/src/js/views/basic/basic_model.js
@@ -4100,10 +4100,20 @@ var BasicModel = AbstractModel.extend({
                 var r2 = self.localData[record2ID];
                 var data1 = _.extend({}, r1.data, r1._changes);
                 var data2 = _.extend({}, r2.data, r2._changes);
-                if (data1[order.name] < data2[order.name]) {
+
+                // Default value to sort against: the value of the field
+                var orderData1 = data1[order.name];
+                var orderData2 = data2[order.name];
+
+                // If the field is a relation, sort on the display_name of those records
+                if (list.fields[order.name].type === 'many2one') {
+                    orderData1 = orderData1 ? self.localData[orderData1].data.display_name : "";
+                    orderData2 = orderData2 ? self.localData[orderData2].data.display_name : "";
+                }
+                if (orderData1 < orderData2) {
                     return order.asc ? -1 : 1;
                 }
-                if (data1[order.name] > data2[order.name]) {
+                if (orderData1 > orderData2) {
                     return order.asc ? 1 : -1;
                 }
                 return compareRecords(record1ID, record2ID, level + 1);
diff --git a/addons/web/static/tests/fields/relational_fields_tests.js b/addons/web/static/tests/fields/relational_fields_tests.js
index db91d9d3ae5..9d7362972de 100644
--- a/addons/web/static/tests/fields/relational_fields_tests.js
+++ b/addons/web/static/tests/fields/relational_fields_tests.js
@@ -2271,6 +2271,43 @@ QUnit.module('relational_fields', {
         form.destroy();
     });
 
+    QUnit.test('x2many list sorted by many2one', function (assert) {
+        assert.expect(3);
+
+        this.data.partner.records[0].p = [1, 2, 4];
+        this.data.partner.fields.trululu.sortable = true;
+
+        var form = createView({
+            View: FormView,
+            model: 'partner',
+            data: this.data,
+            arch: '<form>' +
+                        '<field name="p">' +
+                            '<tree>' +
+                                '<field name="id"/>' +
+                                '<field name="trululu"/>' +
+                            '</tree>' +
+                        '</field>' +
+                '</form>',
+            res_id: 1,
+        });
+
+        assert.strictEqual(form.$('.o_data_row .o_list_number').text(), '124',
+            "should have correct order initially");
+
+        form.$('.o_list_view thead th:nth(1)').click();
+
+        assert.strictEqual(form.$('.o_data_row .o_list_number').text(), '412',
+            "should have correct order (ASC)");
+
+        form.$('.o_list_view thead th:nth(1)').click();
+
+        assert.strictEqual(form.$('.o_data_row .o_list_number').text(), '214',
+            "should have correct order (DESC)");
+
+        form.destroy();
+    });
+
     QUnit.test('many2many list add *many* records, remove, re-add', function (assert) {
         assert.expect(5);
 

From 47cc4fbbab6e532b056fee26542283bd65978ac7 Mon Sep 17 00:00:00 2001
From: len-odoo <len@odoo.com>
Date: Tue, 15 May 2018 10:58:59 +0200
Subject: [PATCH 25/51] [FIX] auth_signup: add missing dependency on the 
 computation of the signup validity

The field signup_valid is a non stored computed field based on signup_token.
The cache is filled with prefetched values, so in a loop the field is read from
the cache and not recomputed due to the missing dependency.

opw 1843442
---
 addons/auth_signup/models/res_partner.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/auth_signup/models/res_partner.py b/addons/auth_signup/models/res_partner.py
index d2bad560398..cb253555a45 100644
--- a/addons/auth_signup/models/res_partner.py
+++ b/addons/auth_signup/models/res_partner.py
@@ -33,6 +33,7 @@ class ResPartner(models.Model):
     signup_url = fields.Char(compute='_compute_signup_url', string='Signup URL')
 
     @api.multi
+    @api.depends('signup_token', 'signup_expiration')
     def _compute_signup_valid(self):
         dt = now()
         for partner in self:

From 9db6dfa25df26b340176b43d4c7df9d004b27afb Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Tue, 15 May 2018 19:19:51 +0200
Subject: [PATCH 26/51] [FIX] event_sale: update registrations as sudo.

Consequence of 19878d011f8abdc737b7b702c4c79632670d4b78

Backport of fb17edd0b0d5c956f6991feabfa704566fa0a11b
---
 addons/event_sale/models/sale_order.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event_sale/models/sale_order.py b/addons/event_sale/models/sale_order.py
index 8c2b8bc0c3f..30c5e40d122 100644
--- a/addons/event_sale/models/sale_order.py
+++ b/addons/event_sale/models/sale_order.py
@@ -56,7 +56,7 @@ class sale_order_line(osv.osv):
         order line has a product_uom_qty attribute that will be the number of
         registrations linked to this line. This method update existing registrations
         and create new one for missing one. """
-        Registration = self.env['event.registration']
+        Registration = self.env['event.registration'].sudo()
         registrations = Registration.search([('sale_order_line_id', 'in', self.ids)])
         for so_line in [l for l in self if l.event_id]:
             existing_registrations = registrations.filtered(lambda self: self.sale_order_line_id.id == so_line.id)

From 6fce298d7013379c4383e8368c40ee06d6146423 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Tue, 15 May 2018 12:14:02 +0200
Subject: [PATCH 27/51] [FIX] account: tax computation at reconciliation

- Create a tax included of 7.7%
- Set the company rounding to 'Round Globally'
- Create a bank statement of 10.70, reconcile
- Add a manual line with the 7.7% tax

An extra line of 0.01 remains.

The remaining amount after subtracting the tax is `0.00499...`, which
is rounded to `0.005` by `Math.round(total*1000)/1000`, and finally
displayed as `0.01`.

The 'Round Globally' setting makes sense for objects containing multiple
lines, such as SO, PO or invoice. In the case of a reconciliation, we
can switch to the 'Round per line' config.

opw-1837986
---
 .../account/static/src/js/reconciliation/reconciliation_model.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account/static/src/js/reconciliation/reconciliation_model.js b/addons/account/static/src/js/reconciliation/reconciliation_model.js
index 796531e9a62..ab10c740b63 100644
--- a/addons/account/static/src/js/reconciliation/reconciliation_model.js
+++ b/addons/account/static/src/js/reconciliation/reconciliation_model.js
@@ -785,6 +785,7 @@ var StatementModel = BasicModel.extend({
                         model: 'account.tax',
                         method: 'json_friendly_compute_all',
                         args: args,
+                        context: $.extend(self.context || {}, {'round': true}),
                     })
                     .then(function (result) {
                         _.each(result.taxes, function(tax){

From b8f5f17aed48876bfeab2b321e15f719983ea3b5 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Tue, 15 May 2018 17:14:51 +0200
Subject: [PATCH 28/51] [FIX] event: don't block scheduler at first exception

Before this commit, when a scheduler fail for one event (eg: error in send_mail),
the cron stop and don't continue to process all others event's scheduler.

Now we try to warn (~ randomly once by hour) the responsible/organizer/write_uid
that an error occurs with this scheduler, and we continue to process the others.

opw-1840497
closes #24741
---
 addons/event/models/event_mail.py | 50 +++++++++++++++++++++++++++++--
 1 file changed, 47 insertions(+), 3 deletions(-)

diff --git a/addons/event/models/event_mail.py b/addons/event/models/event_mail.py
index 1013f5a083b..680e1d4ba8a 100644
--- a/addons/event/models/event_mail.py
+++ b/addons/event/models/event_mail.py
@@ -4,7 +4,12 @@ from datetime import datetime
 from dateutil.relativedelta import relativedelta
 
 from odoo import api, fields, models, tools
+from odoo.tools import exception_to_unicode
+from odoo.tools.translate import _
 
+import random
+import logging
+_logger = logging.getLogger(__name__)
 
 _INTERVALS = {
     'hours': lambda interval: relativedelta(hours=interval),
@@ -114,13 +119,52 @@ class EventMailScheduler(models.Model):
                 self.write({'mail_sent': True})
         return True
 
+    @api.model
+    def _warn_template_error(self, scheduler, exception):
+        # We warn ~ once by hour ~ instead of every 10 min if the interval unit is more than 'hours'.
+        if random.random() < 0.1666 or scheduler.interval_unit in ('now', 'hours'):
+            ex_s = exception_to_unicode(exception)
+            try:
+                event, template = scheduler.event_id, scheduler.template_id
+                emails = list(set([event.organizer_id.email, event.user_id.email, template.write_uid.email]))
+                subject = _("WARNING: Event Scheduler Error for event: %s" % event.name)
+                body = _("""Event Scheduler for:
+                              - Event: %s (%s)
+                              - Scheduled: %s
+                              - Template: %s (%s)
+
+                            Failed with error:
+                              - %s
+
+                            You receive this email because you are:
+                              - the organizer of the event,
+                              - or the responsible of the event,
+                              - or the last writer of the template."""
+                         % (event.name, event.id, scheduler.scheduled_date, template.name, template.id, ex_s))
+                email = self.env['ir.mail_server'].build_email(
+                    email_from=self.env.user.email,
+                    email_to=emails,
+                    subject=subject, body=body,
+                )
+                self.env['ir.mail_server'].send_email(email)
+            except Exception as e:
+                _logger.error("Exception while sending traceback by email: %s.\n Original Traceback:\n%s", e, exception)
+                pass
+
     @api.model
     def run(self, autocommit=False):
         schedulers = self.search([('done', '=', False), ('scheduled_date', '<=', datetime.strftime(fields.datetime.now(), tools.DEFAULT_SERVER_DATETIME_FORMAT))])
         for scheduler in schedulers:
-            scheduler.execute()
-            if autocommit:
-                self.env.cr.commit()
+            try:
+                with self.env.cr.savepoint():
+                    scheduler.execute()
+            except Exception as e:
+                _logger.exception(e)
+                self.invalidate_cache()
+                self._warn_template_error(scheduler, e)
+            else:
+                if autocommit:
+                    self.env.cr.commit()
         return True
 
 

From cdabb9d74c93bca30a6a129bb9c6774e4c0212e8 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@odoo.com>
Date: Wed, 16 May 2018 12:17:14 +0200
Subject: [PATCH 29/51] [FIX] auth_signup: remove password from welcome message

Revision 054c68689b58f554e9433938644f2960720e08ef added by mistake the
password of the new user in the welcome message that is sent to users
who signed up with an invitation token.

There is no need for this, the user has just chosen their password, and
we should not send them a copy which could be compromised on the way to
their inbox or later in their inbox.
It may also give users the impression that their passwords is stored in
cleartext in the database, even when that is not the case.

This patch minimalizes changes to the template and its translations.
For existing databases where the code is updated without re-syncing the
template, the password will simply be missing in the message (until a
resync of auth_signup module is done)
---
 addons/auth_signup/controllers/main.py       | 1 -
 addons/auth_signup/data/auth_signup_data.xml | 1 -
 addons/auth_signup/i18n/af.po                | 1 -
 addons/auth_signup/i18n/am.po                | 1 -
 addons/auth_signup/i18n/ar.po                | 1 -
 addons/auth_signup/i18n/auth_signup.pot      | 1 -
 addons/auth_signup/i18n/bg.po                | 1 -
 addons/auth_signup/i18n/bs.po                | 1 -
 addons/auth_signup/i18n/ca.po                | 1 -
 addons/auth_signup/i18n/cs.po                | 1 -
 addons/auth_signup/i18n/da.po                | 1 -
 addons/auth_signup/i18n/de.po                | 2 --
 addons/auth_signup/i18n/el.po                | 2 --
 addons/auth_signup/i18n/en_GB.po             | 1 -
 addons/auth_signup/i18n/es.po                | 2 --
 addons/auth_signup/i18n/es_AR.po             | 1 -
 addons/auth_signup/i18n/es_BO.po             | 1 -
 addons/auth_signup/i18n/es_CL.po             | 1 -
 addons/auth_signup/i18n/es_CO.po             | 1 -
 addons/auth_signup/i18n/es_CR.po             | 1 -
 addons/auth_signup/i18n/es_DO.po             | 1 -
 addons/auth_signup/i18n/es_EC.po             | 1 -
 addons/auth_signup/i18n/es_PA.po             | 1 -
 addons/auth_signup/i18n/es_PE.po             | 1 -
 addons/auth_signup/i18n/es_PY.po             | 1 -
 addons/auth_signup/i18n/es_VE.po             | 1 -
 addons/auth_signup/i18n/et.po                | 1 -
 addons/auth_signup/i18n/eu.po                | 1 -
 addons/auth_signup/i18n/fa.po                | 1 -
 addons/auth_signup/i18n/fi.po                | 1 -
 addons/auth_signup/i18n/fo.po                | 1 -
 addons/auth_signup/i18n/fr.po                | 2 --
 addons/auth_signup/i18n/fr_CA.po             | 1 -
 addons/auth_signup/i18n/gl.po                | 1 -
 addons/auth_signup/i18n/gu.po                | 1 -
 addons/auth_signup/i18n/he.po                | 1 -
 addons/auth_signup/i18n/hr.po                | 1 -
 addons/auth_signup/i18n/hu.po                | 1 -
 addons/auth_signup/i18n/id.po                | 1 -
 addons/auth_signup/i18n/it.po                | 1 -
 addons/auth_signup/i18n/ja.po                | 1 -
 addons/auth_signup/i18n/ka.po                | 1 -
 addons/auth_signup/i18n/kab.po               | 1 -
 addons/auth_signup/i18n/ko.po                | 1 -
 addons/auth_signup/i18n/lo.po                | 1 -
 addons/auth_signup/i18n/lt.po                | 2 --
 addons/auth_signup/i18n/lv.po                | 1 -
 addons/auth_signup/i18n/mk.po                | 1 -
 addons/auth_signup/i18n/mn.po                | 1 -
 addons/auth_signup/i18n/nb.po                | 1 -
 addons/auth_signup/i18n/ne.po                | 1 -
 addons/auth_signup/i18n/nl.po                | 2 --
 addons/auth_signup/i18n/nl_BE.po             | 1 -
 addons/auth_signup/i18n/pl.po                | 1 -
 addons/auth_signup/i18n/pt.po                | 1 -
 addons/auth_signup/i18n/pt_BR.po             | 2 --
 addons/auth_signup/i18n/ro.po                | 1 -
 addons/auth_signup/i18n/ru.po                | 1 -
 addons/auth_signup/i18n/sk.po                | 1 -
 addons/auth_signup/i18n/sl.po                | 1 -
 addons/auth_signup/i18n/sq.po                | 1 -
 addons/auth_signup/i18n/sr.po                | 1 -
 addons/auth_signup/i18n/sr@latin.po          | 1 -
 addons/auth_signup/i18n/sv.po                | 1 -
 addons/auth_signup/i18n/th.po                | 1 -
 addons/auth_signup/i18n/tr.po                | 1 -
 addons/auth_signup/i18n/uk.po                | 1 -
 addons/auth_signup/i18n/vi.po                | 1 -
 addons/auth_signup/i18n/zh_CN.po             | 2 --
 addons/auth_signup/i18n/zh_TW.po             | 1 -
 70 files changed, 78 deletions(-)

diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py
index 1d1b0476337..bce24f07885 100644
--- a/addons/auth_signup/controllers/main.py
+++ b/addons/auth_signup/controllers/main.py
@@ -42,7 +42,6 @@ class AuthSignupHome(Home):
                         template.sudo().with_context(
                             lang=user_sudo.lang,
                             auth_login=werkzeug.url_encode({'auth_login': user_sudo.email}),
-                            password=request.params.get('password')
                         ).send_mail(user_sudo.id, force_send=True)
                 return super(AuthSignupHome, self).web_login(*args, **kw)
             except UserError as e:
diff --git a/addons/auth_signup/data/auth_signup_data.xml b/addons/auth_signup/data/auth_signup_data.xml
index b9f88893d2a..b3364a51658 100644
--- a/addons/auth_signup/data/auth_signup_data.xml
+++ b/addons/auth_signup/data/auth_signup_data.xml
@@ -116,7 +116,6 @@
     <p>
         Your login: ${object.email}
         <br/>
-        Your password: ${ctx['password']}
     </p>
     <p>
         To gain access to your account, you can use the following link:
diff --git a/addons/auth_signup/i18n/af.po b/addons/auth_signup/i18n/af.po
index e95f0c01e3a..8fe284f2eb6 100644
--- a/addons/auth_signup/i18n/af.po
+++ b/addons/auth_signup/i18n/af.po
@@ -109,7 +109,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/am.po b/addons/auth_signup/i18n/am.po
index 884e96a66f0..7ed08db42cb 100644
--- a/addons/auth_signup/i18n/am.po
+++ b/addons/auth_signup/i18n/am.po
@@ -108,7 +108,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/ar.po b/addons/auth_signup/i18n/ar.po
index aec6d4ea4b9..b379535575d 100644
--- a/addons/auth_signup/i18n/ar.po
+++ b/addons/auth_signup/i18n/ar.po
@@ -115,7 +115,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/auth_signup.pot b/addons/auth_signup/i18n/auth_signup.pot
index d14676bed0b..2a55058943a 100644
--- a/addons/auth_signup/i18n/auth_signup.pot
+++ b/addons/auth_signup/i18n/auth_signup.pot
@@ -102,7 +102,6 @@ msgid "<div style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repe
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/bg.po b/addons/auth_signup/i18n/bg.po
index 42b73456d16..7ea2482acda 100644
--- a/addons/auth_signup/i18n/bg.po
+++ b/addons/auth_signup/i18n/bg.po
@@ -112,7 +112,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/bs.po b/addons/auth_signup/i18n/bs.po
index e30567817fb..72953b3e2fb 100644
--- a/addons/auth_signup/i18n/bs.po
+++ b/addons/auth_signup/i18n/bs.po
@@ -109,7 +109,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/ca.po b/addons/auth_signup/i18n/ca.po
index 4154a0f8705..0d58beeaac2 100644
--- a/addons/auth_signup/i18n/ca.po
+++ b/addons/auth_signup/i18n/ca.po
@@ -134,7 +134,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/cs.po b/addons/auth_signup/i18n/cs.po
index ee70411fb3a..af80655808a 100644
--- a/addons/auth_signup/i18n/cs.po
+++ b/addons/auth_signup/i18n/cs.po
@@ -109,7 +109,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/da.po b/addons/auth_signup/i18n/da.po
index 2a50f034c72..f64def7236e 100644
--- a/addons/auth_signup/i18n/da.po
+++ b/addons/auth_signup/i18n/da.po
@@ -167,7 +167,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/de.po b/addons/auth_signup/i18n/de.po
index 39935643c34..84fe3bdd16c 100644
--- a/addons/auth_signup/i18n/de.po
+++ b/addons/auth_signup/i18n/de.po
@@ -176,7 +176,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
@@ -210,7 +209,6 @@ msgstr ""
 "    <p>\n"
 "        Ihre Anmeldedaten: ${object.email}\n"
 "        <br/>\n"
-"        Ihr Passwort: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        Um Zugriff auf Ihr Konto zu erlangen, können Sie den folgenden Link verwenden:\n"
diff --git a/addons/auth_signup/i18n/el.po b/addons/auth_signup/i18n/el.po
index 527e38d061c..bdd6ddbfdeb 100644
--- a/addons/auth_signup/i18n/el.po
+++ b/addons/auth_signup/i18n/el.po
@@ -165,7 +165,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
@@ -199,7 +198,6 @@ msgstr ""
 " <p>\n"
 " Email/Όνομα χρήστη: ${object.email}\n"
 " <br/>\n"
-" Κωδικός Πρόσβασης: ${ctx['password']}\n"
 " </p>\n"
 " <p>\n"
 " Για να αποκτήσετε πρόσβαση στο λογαριασμό σας, ακολουθήστε τον παρακάτω σύνδεσμο:\n"
diff --git a/addons/auth_signup/i18n/en_GB.po b/addons/auth_signup/i18n/en_GB.po
index c533eb0e2c3..e9d962451fc 100644
--- a/addons/auth_signup/i18n/en_GB.po
+++ b/addons/auth_signup/i18n/en_GB.po
@@ -108,7 +108,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/es.po b/addons/auth_signup/i18n/es.po
index 32c650d770f..4349fcd5ca4 100644
--- a/addons/auth_signup/i18n/es.po
+++ b/addons/auth_signup/i18n/es.po
@@ -174,7 +174,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
@@ -208,7 +207,6 @@ msgstr ""
 "    <p>\n"
 "        Usuario: ${object.email}\n"
 "        <br/>\n"
-"        Contraseña: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        Puede acceder a su cuenta desde el siguiente enlace:\n"
diff --git a/addons/auth_signup/i18n/es_AR.po b/addons/auth_signup/i18n/es_AR.po
index 8d8866cef06..64e393f129a 100644
--- a/addons/auth_signup/i18n/es_AR.po
+++ b/addons/auth_signup/i18n/es_AR.po
@@ -142,7 +142,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/es_BO.po b/addons/auth_signup/i18n/es_BO.po
index bfd8e1e489e..47b5859f164 100644
--- a/addons/auth_signup/i18n/es_BO.po
+++ b/addons/auth_signup/i18n/es_BO.po
@@ -142,7 +142,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/es_CL.po b/addons/auth_signup/i18n/es_CL.po
index a67181ae4d1..ea610d886fe 100644
--- a/addons/auth_signup/i18n/es_CL.po
+++ b/addons/auth_signup/i18n/es_CL.po
@@ -142,7 +142,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/es_CO.po b/addons/auth_signup/i18n/es_CO.po
index c663d241bab..e8d1451aff7 100644
--- a/addons/auth_signup/i18n/es_CO.po
+++ b/addons/auth_signup/i18n/es_CO.po
@@ -142,7 +142,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/es_CR.po b/addons/auth_signup/i18n/es_CR.po
index e62e0727939..8f7b7380f02 100644
--- a/addons/auth_signup/i18n/es_CR.po
+++ b/addons/auth_signup/i18n/es_CR.po
@@ -142,7 +142,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/es_DO.po b/addons/auth_signup/i18n/es_DO.po
index ae7f686a112..eb6d9532822 100644
--- a/addons/auth_signup/i18n/es_DO.po
+++ b/addons/auth_signup/i18n/es_DO.po
@@ -142,7 +142,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/es_EC.po b/addons/auth_signup/i18n/es_EC.po
index 49115bebd99..9c46530c695 100644
--- a/addons/auth_signup/i18n/es_EC.po
+++ b/addons/auth_signup/i18n/es_EC.po
@@ -142,7 +142,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/es_PA.po b/addons/auth_signup/i18n/es_PA.po
index b7e4b4a2b79..7300ae412a2 100644
--- a/addons/auth_signup/i18n/es_PA.po
+++ b/addons/auth_signup/i18n/es_PA.po
@@ -141,7 +141,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/es_PE.po b/addons/auth_signup/i18n/es_PE.po
index 7831cdc8391..8f56db0a42c 100644
--- a/addons/auth_signup/i18n/es_PE.po
+++ b/addons/auth_signup/i18n/es_PE.po
@@ -142,7 +142,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/es_PY.po b/addons/auth_signup/i18n/es_PY.po
index 32973798220..ee3607f40ee 100644
--- a/addons/auth_signup/i18n/es_PY.po
+++ b/addons/auth_signup/i18n/es_PY.po
@@ -142,7 +142,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/es_VE.po b/addons/auth_signup/i18n/es_VE.po
index f952ba5f792..d36f3817ded 100644
--- a/addons/auth_signup/i18n/es_VE.po
+++ b/addons/auth_signup/i18n/es_VE.po
@@ -142,7 +142,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/et.po b/addons/auth_signup/i18n/et.po
index fb99e25ebda..39c7ab2ae08 100644
--- a/addons/auth_signup/i18n/et.po
+++ b/addons/auth_signup/i18n/et.po
@@ -113,7 +113,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/eu.po b/addons/auth_signup/i18n/eu.po
index 1a0ce5bd509..5d2a38415f7 100644
--- a/addons/auth_signup/i18n/eu.po
+++ b/addons/auth_signup/i18n/eu.po
@@ -109,7 +109,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/fa.po b/addons/auth_signup/i18n/fa.po
index 725e37a6f1c..3aee3d5b30d 100644
--- a/addons/auth_signup/i18n/fa.po
+++ b/addons/auth_signup/i18n/fa.po
@@ -112,7 +112,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/fi.po b/addons/auth_signup/i18n/fi.po
index 45126bd0c40..50afb11038f 100644
--- a/addons/auth_signup/i18n/fi.po
+++ b/addons/auth_signup/i18n/fi.po
@@ -115,7 +115,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/fo.po b/addons/auth_signup/i18n/fo.po
index c2b513c1339..47a4304b83d 100644
--- a/addons/auth_signup/i18n/fo.po
+++ b/addons/auth_signup/i18n/fo.po
@@ -105,7 +105,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/fr.po b/addons/auth_signup/i18n/fr.po
index 1ce976aeb06..9a06c282f7d 100644
--- a/addons/auth_signup/i18n/fr.po
+++ b/addons/auth_signup/i18n/fr.po
@@ -165,7 +165,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
@@ -195,7 +194,6 @@ msgstr ""
 " <p>\n"
 " Votre identifiant : ${object.email}\n"
 " <br/>\n"
-" Votre mot de passe : ${ctx['password']}\n"
 "</p> <p>\n"
 " \n"
 " Pour accéder à votre compte, vous pouvez utiliser le lien suivant :\n"
diff --git a/addons/auth_signup/i18n/fr_CA.po b/addons/auth_signup/i18n/fr_CA.po
index 469fd480492..516ffa5ceaa 100644
--- a/addons/auth_signup/i18n/fr_CA.po
+++ b/addons/auth_signup/i18n/fr_CA.po
@@ -108,7 +108,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/gl.po b/addons/auth_signup/i18n/gl.po
index d3ba0b2ac14..7e3f96ee07e 100644
--- a/addons/auth_signup/i18n/gl.po
+++ b/addons/auth_signup/i18n/gl.po
@@ -108,7 +108,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/gu.po b/addons/auth_signup/i18n/gu.po
index e36ed3369b5..9899535ddd7 100644
--- a/addons/auth_signup/i18n/gu.po
+++ b/addons/auth_signup/i18n/gu.po
@@ -109,7 +109,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/he.po b/addons/auth_signup/i18n/he.po
index d4adca058c8..5010a56142a 100644
--- a/addons/auth_signup/i18n/he.po
+++ b/addons/auth_signup/i18n/he.po
@@ -108,7 +108,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/hr.po b/addons/auth_signup/i18n/hr.po
index a51417494c2..e28691d2ab8 100644
--- a/addons/auth_signup/i18n/hr.po
+++ b/addons/auth_signup/i18n/hr.po
@@ -143,7 +143,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/hu.po b/addons/auth_signup/i18n/hu.po
index 24c13f4e57a..cfd59a75b52 100644
--- a/addons/auth_signup/i18n/hu.po
+++ b/addons/auth_signup/i18n/hu.po
@@ -165,7 +165,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/id.po b/addons/auth_signup/i18n/id.po
index 6a1a3ff1898..3105d982405 100644
--- a/addons/auth_signup/i18n/id.po
+++ b/addons/auth_signup/i18n/id.po
@@ -112,7 +112,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/it.po b/addons/auth_signup/i18n/it.po
index 7062f4d1605..5f0dfd9c0c5 100644
--- a/addons/auth_signup/i18n/it.po
+++ b/addons/auth_signup/i18n/it.po
@@ -110,7 +110,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/ja.po b/addons/auth_signup/i18n/ja.po
index 14f82c46eda..042c36e57b5 100644
--- a/addons/auth_signup/i18n/ja.po
+++ b/addons/auth_signup/i18n/ja.po
@@ -165,7 +165,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/ka.po b/addons/auth_signup/i18n/ka.po
index 42efcdb58f4..25971dd117e 100644
--- a/addons/auth_signup/i18n/ka.po
+++ b/addons/auth_signup/i18n/ka.po
@@ -109,7 +109,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/kab.po b/addons/auth_signup/i18n/kab.po
index 0dec5bea4da..0e670472029 100644
--- a/addons/auth_signup/i18n/kab.po
+++ b/addons/auth_signup/i18n/kab.po
@@ -108,7 +108,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/ko.po b/addons/auth_signup/i18n/ko.po
index 809d65abba3..a23730a871c 100644
--- a/addons/auth_signup/i18n/ko.po
+++ b/addons/auth_signup/i18n/ko.po
@@ -111,7 +111,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/lo.po b/addons/auth_signup/i18n/lo.po
index e7bb5b2769a..8ae06fffbc2 100644
--- a/addons/auth_signup/i18n/lo.po
+++ b/addons/auth_signup/i18n/lo.po
@@ -108,7 +108,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/lt.po b/addons/auth_signup/i18n/lt.po
index cb6a84b9b04..77181498483 100644
--- a/addons/auth_signup/i18n/lt.po
+++ b/addons/auth_signup/i18n/lt.po
@@ -169,7 +169,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
@@ -203,7 +202,6 @@ msgstr ""
 "    <p>\n"
 "        Jūsų prisijungimo vardas: ${object.email}\n"
 "        <br/>\n"
-"        Jūsų slaptažodis: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        Prisijungimui prie savo paskyros, galite naudoti šią nuorodą:\n"
diff --git a/addons/auth_signup/i18n/lv.po b/addons/auth_signup/i18n/lv.po
index 837ea92a732..c1ac14aab67 100644
--- a/addons/auth_signup/i18n/lv.po
+++ b/addons/auth_signup/i18n/lv.po
@@ -110,7 +110,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/mk.po b/addons/auth_signup/i18n/mk.po
index 723427f51d1..2bb3dadd211 100644
--- a/addons/auth_signup/i18n/mk.po
+++ b/addons/auth_signup/i18n/mk.po
@@ -108,7 +108,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/mn.po b/addons/auth_signup/i18n/mn.po
index 59d0abc0d33..f4338bae13f 100644
--- a/addons/auth_signup/i18n/mn.po
+++ b/addons/auth_signup/i18n/mn.po
@@ -108,7 +108,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/nb.po b/addons/auth_signup/i18n/nb.po
index 0397adfdfa5..b70c115663f 100644
--- a/addons/auth_signup/i18n/nb.po
+++ b/addons/auth_signup/i18n/nb.po
@@ -136,7 +136,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/ne.po b/addons/auth_signup/i18n/ne.po
index bd9db832c01..d94a5813dea 100644
--- a/addons/auth_signup/i18n/ne.po
+++ b/addons/auth_signup/i18n/ne.po
@@ -109,7 +109,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/nl.po b/addons/auth_signup/i18n/nl.po
index 9bc84576d42..9ceea1d4942 100644
--- a/addons/auth_signup/i18n/nl.po
+++ b/addons/auth_signup/i18n/nl.po
@@ -167,7 +167,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
@@ -201,7 +200,6 @@ msgstr ""
 "    <p>\n"
 "        Uw login: ${object.email}\n"
 "        <br/>\n"
-"        Uw wachtwoord: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        Om toegang te krijgen tot uw account, kan u de volgende link gebruiken::\n"
diff --git a/addons/auth_signup/i18n/nl_BE.po b/addons/auth_signup/i18n/nl_BE.po
index 405e872d815..85eb30d00cd 100644
--- a/addons/auth_signup/i18n/nl_BE.po
+++ b/addons/auth_signup/i18n/nl_BE.po
@@ -108,7 +108,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/pl.po b/addons/auth_signup/i18n/pl.po
index 75a82cfdb0b..b10f6f5831a 100644
--- a/addons/auth_signup/i18n/pl.po
+++ b/addons/auth_signup/i18n/pl.po
@@ -115,7 +115,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/pt.po b/addons/auth_signup/i18n/pt.po
index 670cb2cb90a..c6e7d0228b9 100644
--- a/addons/auth_signup/i18n/pt.po
+++ b/addons/auth_signup/i18n/pt.po
@@ -110,7 +110,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/pt_BR.po b/addons/auth_signup/i18n/pt_BR.po
index 2a700ca35a1..6c15d465714 100644
--- a/addons/auth_signup/i18n/pt_BR.po
+++ b/addons/auth_signup/i18n/pt_BR.po
@@ -167,7 +167,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
@@ -201,7 +200,6 @@ msgstr ""
 "    <p>\n"
 "        Seu login: ${object.email}\n"
 "        <br/>\n"
-"        Sua senha: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        Para acessar sua conta, você pode acessar o seguinte link:\n"
diff --git a/addons/auth_signup/i18n/ro.po b/addons/auth_signup/i18n/ro.po
index e9c27054c27..668b86514bc 100644
--- a/addons/auth_signup/i18n/ro.po
+++ b/addons/auth_signup/i18n/ro.po
@@ -165,7 +165,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/ru.po b/addons/auth_signup/i18n/ru.po
index ff71bf2746a..35f6bb4a5e6 100644
--- a/addons/auth_signup/i18n/ru.po
+++ b/addons/auth_signup/i18n/ru.po
@@ -172,7 +172,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/sk.po b/addons/auth_signup/i18n/sk.po
index a4d1b88045a..19ffb9c03ff 100644
--- a/addons/auth_signup/i18n/sk.po
+++ b/addons/auth_signup/i18n/sk.po
@@ -109,7 +109,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/sl.po b/addons/auth_signup/i18n/sl.po
index 9d55f11f98d..d2011ee612c 100644
--- a/addons/auth_signup/i18n/sl.po
+++ b/addons/auth_signup/i18n/sl.po
@@ -108,7 +108,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/sq.po b/addons/auth_signup/i18n/sq.po
index 164fdf95948..0bcff3b0ad8 100644
--- a/addons/auth_signup/i18n/sq.po
+++ b/addons/auth_signup/i18n/sq.po
@@ -108,7 +108,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/sr.po b/addons/auth_signup/i18n/sr.po
index 39bcf501d75..6a1f8a51afb 100644
--- a/addons/auth_signup/i18n/sr.po
+++ b/addons/auth_signup/i18n/sr.po
@@ -108,7 +108,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/sr@latin.po b/addons/auth_signup/i18n/sr@latin.po
index 08a385e2a3b..bd4ac9ee65e 100644
--- a/addons/auth_signup/i18n/sr@latin.po
+++ b/addons/auth_signup/i18n/sr@latin.po
@@ -110,7 +110,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/sv.po b/addons/auth_signup/i18n/sv.po
index d3b6c33642c..aa14a9b4a39 100644
--- a/addons/auth_signup/i18n/sv.po
+++ b/addons/auth_signup/i18n/sv.po
@@ -109,7 +109,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/th.po b/addons/auth_signup/i18n/th.po
index 16eaf1167ef..46fe1210082 100644
--- a/addons/auth_signup/i18n/th.po
+++ b/addons/auth_signup/i18n/th.po
@@ -108,7 +108,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/tr.po b/addons/auth_signup/i18n/tr.po
index 7516441be69..8e0333e0cb6 100644
--- a/addons/auth_signup/i18n/tr.po
+++ b/addons/auth_signup/i18n/tr.po
@@ -170,7 +170,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/uk.po b/addons/auth_signup/i18n/uk.po
index d2223996c04..0666c2a5bb4 100644
--- a/addons/auth_signup/i18n/uk.po
+++ b/addons/auth_signup/i18n/uk.po
@@ -169,7 +169,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/vi.po b/addons/auth_signup/i18n/vi.po
index 4fd58b26cfa..84d5bab21b7 100644
--- a/addons/auth_signup/i18n/vi.po
+++ b/addons/auth_signup/i18n/vi.po
@@ -109,7 +109,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
diff --git a/addons/auth_signup/i18n/zh_CN.po b/addons/auth_signup/i18n/zh_CN.po
index 8accd5a1bed..6c02191a5b6 100644
--- a/addons/auth_signup/i18n/zh_CN.po
+++ b/addons/auth_signup/i18n/zh_CN.po
@@ -170,7 +170,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"
@@ -204,7 +203,6 @@ msgstr ""
 "    <p>\n"
 "        您的登录账号：${object.email}\n"
 "        <br/>\n"
-"        您的密码：${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        要获取访问您账户的权限，可使用以下链接：\n"
diff --git a/addons/auth_signup/i18n/zh_TW.po b/addons/auth_signup/i18n/zh_TW.po
index fd843e2e2f2..9c710056350 100644
--- a/addons/auth_signup/i18n/zh_TW.po
+++ b/addons/auth_signup/i18n/zh_TW.po
@@ -166,7 +166,6 @@ msgid ""
 "    <p>\n"
 "        Your login: ${object.email}\n"
 "        <br/>\n"
-"        Your password: ${ctx['password']}\n"
 "    </p>\n"
 "    <p>\n"
 "        To gain access to your account, you can use the following link:\n"

From c22d3f67320f3c3edfdd3d00732021e896f2cda6 Mon Sep 17 00:00:00 2001
From: Xavier ALT <xal@odoo.com>
Date: Thu, 3 May 2018 10:07:22 +0200
Subject: [PATCH 30/51] [FIX] web: widget char_domain should pass context to
 selection dialog

In case we define a field like,

<field name="my_domain" widget="char_domain" context="{'active_test': False}"/>

when selecting records the dialog should display all records (as asked by the
context), but it's not the case.

This commit ensure the field context is passed to the selection dialog.

opw-1831902
---
 addons/web/static/src/js/views/form_widgets.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/web/static/src/js/views/form_widgets.js b/addons/web/static/src/js/views/form_widgets.js
index b99732774f2..25b4fbed8ba 100644
--- a/addons/web/static/src/js/views/form_widgets.js
+++ b/addons/web/static/src/js/views/form_widgets.js
@@ -454,6 +454,7 @@ var FieldCharDomain = common.AbstractField.extend(common.ReinitializeFieldMixin,
         var self = this;
         var dialog = new common.DomainEditorDialog(this, {
             res_model: this.options.model || this.field_manager.get_field_value(this.options.model_field),
+            context: self.build_context(),
             default_domain: this.get('value'),
             title: this.get('effective_readonly') ? _t('Selected records') : _t('Select records...'),
             readonly: this.get('effective_readonly'),

From 491243d1caa46b75a08a656a0049e79fd7597258 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Wed, 16 May 2018 13:23:00 +0200
Subject: [PATCH 31/51] [FIX] stock_account: partial reception with avg cost
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Create a product where the associated product category has Costing
  Method "Average Cost (AVCO)"
- Create a PO. Order 1 unit at $1000.
- Receive that unit. (System now has 1 unit at $1000).
- Create another PO. Order 3 units at $500 each.
- Receive only 1 unit and don’t create any back order.

System has 2 units @ $625, instead of $750.

The quantity computed should take into account the quantity actually
done.

opw-1843998
---
 addons/stock_account/models/stock.py          |  8 +++--
 .../tests/test_stockvaluation.py              | 33 +++++++++++++++++++
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/addons/stock_account/models/stock.py b/addons/stock_account/models/stock.py
index 113ff99b87a..2a7cb101c4e 100644
--- a/addons/stock_account/models/stock.py
+++ b/addons/stock_account/models/stock.py
@@ -372,6 +372,7 @@ class StockMove(models.Model):
             product_tot_qty_available = move.product_id.qty_available + tmpl_dict[move.product_id.id]
             rounding = move.product_id.uom_id.rounding
 
+            qty_done = 0.0
             if float_is_zero(product_tot_qty_available, precision_rounding=rounding):
                 new_std_price = move._get_price_unit()
             elif float_is_zero(product_tot_qty_available + move.product_qty, precision_rounding=rounding):
@@ -379,10 +380,11 @@ class StockMove(models.Model):
             else:
                 # Get the standard price
                 amount_unit = std_price_update.get((move.company_id.id, move.product_id.id)) or move.product_id.standard_price
-                qty = forced_qty or move.product_qty
-                new_std_price = ((amount_unit * product_tot_qty_available) + (move._get_price_unit() * qty)) / (product_tot_qty_available + move.product_qty)
+                qty_done = move.product_uom._compute_quantity(move.quantity_done, move.product_id.uom_id)
+                qty = forced_qty or qty_done
+                new_std_price = ((amount_unit * product_tot_qty_available) + (move._get_price_unit() * qty)) / (product_tot_qty_available + qty_done)
 
-            tmpl_dict[move.product_id.id] += move.product_qty
+            tmpl_dict[move.product_id.id] += qty_done
             # Write the standard price, as SUPERUSER_ID because a warehouse manager may not have the right to write on products
             move.product_id.with_context(force_company=move.company_id.id).sudo().write({'standard_price': new_std_price})
             std_price_update[move.company_id.id, move.product_id.id] = new_std_price
diff --git a/addons/stock_account/tests/test_stockvaluation.py b/addons/stock_account/tests/test_stockvaluation.py
index 50cc57885bb..0450d66e9a1 100644
--- a/addons/stock_account/tests/test_stockvaluation.py
+++ b/addons/stock_account/tests/test_stockvaluation.py
@@ -2489,6 +2489,39 @@ class TestStockValuation(TransactionCase):
         move2.move_line_ids.qty_done = 0
         self.assertEqual(self.product1.stock_value, -187.5)
 
+    def test_average_perpetual_4(self):
+        self.product1.product_tmpl_id.cost_method = 'average'
+
+        move1 = self.env['stock.move'].create({
+            'name': 'Receive 1 unit at 10',
+            'location_id': self.supplier_location.id,
+            'location_dest_id': self.stock_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 1.0,
+            'price_unit': 10,
+        })
+        move1._action_confirm()
+        move1._action_assign()
+        move1.move_line_ids.qty_done = 1.0
+        move1._action_done()
+
+        move2 = self.env['stock.move'].create({
+            'name': 'Receive 3 units at 5',
+            'location_id': self.supplier_location.id,
+            'location_dest_id': self.stock_location.id,
+            'product_id': self.product1.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 3.0,
+            'price_unit': 5,
+        })
+        move2._action_confirm()
+        move2._action_assign()
+        move2.move_line_ids.qty_done = 1.0
+        move2._action_done()
+
+        self.assertAlmostEqual(self.product1.standard_price, 7.5)
+
     def test_average_negative_1(self):
         """ Test edit in the past. Receive 10, send 20, edit the second move to only send 10.
         """

From 1c6aa878cb8cf71f02596e28f0e2ba63981ad339 Mon Sep 17 00:00:00 2001
From: Toufik Benjaa <tbe@odoo.com>
Date: Tue, 15 May 2018 18:13:35 +0200
Subject: [PATCH 32/51] [FIX] project: Access rights issue on /my/tasks

- Portal users do not have the rights to read on project.project.
  This causes issues on the page "/my/tasks" as it is trying to read the label_tasks and the name of the tasks' project.

  To address this issue we read those two fields using sudo
---
 addons/project/views/project_portal_templates.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/views/project_portal_templates.xml b/addons/project/views/project_portal_templates.xml
index 2a75caba97f..7273a76faad 100644
--- a/addons/project/views/project_portal_templates.xml
+++ b/addons/project/views/project_portal_templates.xml
@@ -142,7 +142,7 @@
                             <thead>
                                 <tr class="active">
                                     <th t-if="groupby == 'none'" class="col-md-9">Name</th>
-                                    <th t-else="" class="col-md-9"><span t-field="tasks[0].project_id.label_tasks"/> for project: <span t-field="tasks[0].project_id.name"/></th>
+                                    <th t-else="" class="col-md-9"><span t-field="tasks[0].sudo().project_id.label_tasks"/> for project: <span t-field="tasks[0].sudo().project_id.name"/></th>
                                     <th class="col-md-2">Stage</th>
                                     <th>Ref</th>
                                 </tr>

From c52243794dc7c9874373f98528ce606bb80a029d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20K=C3=BChn?= <aku@odoo.com>
Date: Wed, 16 May 2018 10:21:19 +0200
Subject: [PATCH 33/51] [REVERT] "[FIX] mail: fix composer style for chat
 windows"

This reverts commit 0275c70f78b7f10c5f84692dcebc4f2aeeec76b6.
---
 addons/mail/static/src/less/composer.less | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/addons/mail/static/src/less/composer.less b/addons/mail/static/src/less/composer.less
index 2836e3c93bb..976473f6e1e 100644
--- a/addons/mail/static/src/less/composer.less
+++ b/addons/mail/static/src/less/composer.less
@@ -2,6 +2,7 @@
     position: relative;
     .o-flex(0, 0, auto);
     .o-flex-display();
+    margin: 1px 0;
     border-top: none;
     background: @gray-lighter;
 
@@ -36,12 +37,10 @@
             cursor: text;
             display: inline-block;
             height: 100%;
+            padding: 0px 0px @o-mail-chatter-gap;
             white-space: pre-wrap;
             word-break: break-all;
         }
-        .o_composer_text_field {
-            padding: 0 0 @o-mail-chatter-gap;
-        }
         .o_composer_mention_dropdown .o_mention_proposition > a {
             .o-text-overflow();
             width: 100%;
@@ -148,6 +147,7 @@
             .o_composer {
                 display: flex;
                 min-height: 40px;
+                padding: @o-mail-chatter-gap @o-mail-chatter-gap 0 @o-mail-chatter-gap;
                 border-radius: 2px 0 0 2px;
                 border-right-width: 0;
             }
@@ -159,7 +159,6 @@
                 .o-flex-flow(row, wrap);
             }
             .o_composer_text_field {
-                padding: @o-mail-chatter-gap;
                 .o-flex(1, 1, 50%);
             }
             .o_chatter_composer_tools {
@@ -172,8 +171,8 @@
             .o_chatter_composer_tools {
                 border: none;
                 border-left: 1px solid @gray-lighter-dark;
-                padding-top: @o-mail-chatter-gap*0.5;
                 padding-left: @o-mail-chatter-gap*0.5;
+                .o-transform(translateY(-@o-mail-chatter-gap*0.5));
             }
 
             .o_composer_button_send {
@@ -197,7 +196,6 @@
             border-bottom-width: 1px;
         }
         .o_composer_input {
-            padding: @o-mail-chatter-gap;
             .o-flex-flow(row, nowrap);
 
             .o_chatter_composer_tools {

From 93f9131450118f25c72982f7326ff820cee4aadf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20K=C3=BChn?= <aku@odoo.com>
Date: Wed, 16 May 2018 10:30:55 +0200
Subject: [PATCH 34/51] [REVERT] "[IMP] mail : display mentions in green color
 in edit mode"

This reverts commit c778de44c7cd9b7ef5a9a91738164ab0ebd0ca06.
---
 addons/mail/static/src/js/chatter.js          |   2 +-
 addons/mail/static/src/js/chatter_composer.js |   2 +-
 addons/mail/static/src/js/composer.js         | 257 ++++++------------
 addons/mail/static/src/less/composer.less     |  85 +++---
 .../static/src/less/extended_chat_window.less |   8 +-
 addons/mail/static/src/xml/composer.xml       |  12 +-
 addons/mail/static/tests/chatter_tests.js     |  19 +-
 addons/mail/static/tests/discuss_tests.js     |   9 +-
 addons/web/static/tests/helpers/test_utils.js |  48 ----
 9 files changed, 144 insertions(+), 298 deletions(-)

diff --git a/addons/mail/static/src/js/chatter.js b/addons/mail/static/src/js/chatter.js
index 7d9f324042d..e48a7c60028 100644
--- a/addons/mail/static/src/js/chatter.js
+++ b/addons/mail/static/src/js/chatter.js
@@ -184,7 +184,7 @@ var Chatter = Widget.extend({
             input_baseline: 14,
             is_log: options && options.is_log,
             record_name: this.record_name,
-            default_body: old_composer && old_composer.$input && old_composer.$input.html(),
+            default_body: old_composer && old_composer.$input && old_composer.$input.val(),
             default_mention_selections: old_composer && old_composer.mention_get_listener_selections(),
         });
         this.composer.on('input_focused', this, function () {
diff --git a/addons/mail/static/src/js/chatter_composer.js b/addons/mail/static/src/js/chatter_composer.js
index 0a8088d87ae..c1660ba1c68 100644
--- a/addons/mail/static/src/js/chatter_composer.js
+++ b/addons/mail/static/src/js/chatter_composer.js
@@ -211,7 +211,7 @@ var ChatterComposer = composer.BasicComposer.extend({
         recipient_done.then(function (partner_ids) {
             var context = {
                 default_parent_id: self.id,
-                default_body: utils.get_text2html(self.$input.html()),
+                default_body: utils.get_text2html(self.$input.val()),
                 default_attachment_ids: _.pluck(self.get('attachment_ids'), 'id'),
                 default_partner_ids: partner_ids,
                 default_is_log: self.options.is_log,
diff --git a/addons/mail/static/src/js/composer.js b/addons/mail/static/src/js/composer.js
index 45958a620f6..f89c0382554 100644
--- a/addons/mail/static/src/js/composer.js
+++ b/addons/mail/static/src/js/composer.js
@@ -7,6 +7,7 @@ var utils = require('mail.utils');
 var config = require('web.config');
 var core = require('web.core');
 var data = require('web.data');
+var dom = require('web.dom');
 var session = require('web.session');
 var Widget = require('web.Widget');
 
@@ -29,7 +30,7 @@ var MentionManager = Widget.extend({
 
     events: {
         "mouseover .o_mention_proposition": "on_hover_mention_proposition",
-        "click .o_mention_proposition": "_onClickMentionItem",
+        "click .o_mention_proposition": "on_click_mention_item",
     },
 
     init: function (parent, options) {
@@ -52,6 +53,49 @@ var MentionManager = Widget.extend({
         this.$('.o_mention_proposition').removeClass('active');
         $elem.addClass('active');
     },
+    on_click_mention_item: function (event) {
+        event.preventDefault();
+
+        var text_input = this.composer.$input.val();
+        var id = $(event.currentTarget).data('id');
+        var selected_suggestion = _.find(_.flatten(this.get('mention_suggestions')), function (s) {
+            return s.id === id;
+        });
+        var substitution = selected_suggestion.substitution;
+        if (!substitution) { // no substitution string given, so use the mention name instead
+            // replace white spaces with non-breaking spaces to facilitate mentions detection in text
+            selected_suggestion.name = selected_suggestion.name.replace(/ /g, NON_BREAKING_SPACE);
+            substitution = this.active_listener.delimiter + selected_suggestion.name;
+        }
+        var get_mention_index = function (matches, cursor_position) {
+            for (var i=0; i<matches.length; i++) {
+                if (cursor_position <= matches[i].index) {
+                    return i;
+                }
+            }
+            return i;
+        };
+
+        // add the selected suggestion to the list
+        if (this.active_listener.selection.length) {
+            // get mention matches (ordered by index in the text)
+            var matches = this._get_match(text_input, this.active_listener);
+            var index = get_mention_index(matches, this._get_selection_positions().start);
+            this.active_listener.selection.splice(index, 0, selected_suggestion);
+        } else {
+            this.active_listener.selection.push(selected_suggestion);
+        }
+
+        // update input text, and reset dropdown
+        var cursor_position = this._get_selection_positions().start;
+        var text_left = text_input.substring(0, cursor_position-(this.mention_word.length+1));
+        var text_right = text_input.substring(cursor_position, text_input.length);
+        var text_input_new = text_left + substitution + ' ' + text_right;
+        this.composer.$input.val(text_input_new);
+        this._set_cursor_position(text_left.length+substitution.length+2);
+        this.set('mention_suggestions', []);
+        this.composer.focus(); // to trigger autoresize
+    },
 
     // Public API
     /**
@@ -86,8 +130,8 @@ var MentionManager = Widget.extend({
     get_listener_selection: function (delimiter) {
         var listener = _.findWhere(this.listeners, {delimiter: delimiter});
         if (listener) {
-            var inputMentions = this.composer.$input.text().match(new RegExp(delimiter+'[^ ]+(?= |&nbsp;)', 'g'));
-            return this._validate_selection(listener.selection, inputMentions);
+            var input_mentions = this.composer.$input.val().match(new RegExp(delimiter+'[^ ]+(?= |&nbsp;)', 'g'));
+            return this._validate_selection(listener.selection, input_mentions);
         }
         return [];
     },
@@ -106,15 +150,15 @@ var MentionManager = Widget.extend({
      */
     detect_delimiter: function () {
         var self = this;
-        var textVal = this.composer.$input.html();
-        var cursorPosition = this._getSelectionPositions();
-        var leftString = textVal.substring(0, cursorPosition);
+        var text_val = this.composer.$input.val();
+        var cursor_position = this._get_selection_positions().start;
+        var left_string = text_val.substring(0, cursor_position);
         function validate_keyword (delimiter, beginning_only) {
-            var delimiter_position = leftString.lastIndexOf(delimiter) - 1;
+            var delimiter_position = left_string.lastIndexOf(delimiter) - 1;
             if (beginning_only && delimiter_position > 0) {
                 return false;
             }
-            var search_str = textVal.substring(delimiter_position, cursorPosition);
+            var search_str = text_val.substring(delimiter_position, cursor_position);
             var pattern = "(^"+delimiter+"|(^\\s"+delimiter+"))";
             var regex_start = new RegExp(pattern, "g");
             search_str = search_str.replace(/^\s\s*|^[\n\r]/g, '');
@@ -203,8 +247,6 @@ var MentionManager = Widget.extend({
 
     /**
      * Returns the matches (as RexExp.exec does) for the mention in the input text
-     *
-     * @private
      * @param {String} input_text: the text to search matches
      * @param {Object} listener: the listener for which we want to find a match
      * @returns {Object[]} matches in the same format as RexExp.exec()
@@ -228,32 +270,6 @@ var MentionManager = Widget.extend({
         }
         return result;
     },
-    /**
-     * Get cursor position in contenteditable div with it's inner html content.
-     *
-     * @private
-     * @return a current cursor position
-    */
-    _getSelectionPositions: function () {
-        if (window.getSelection && window.getSelection().getRangeAt) {
-            var range = window.getSelection().getRangeAt(0);
-            var selectedObj = window.getSelection();
-            var rangeCount = 0;
-            var childNodes = selectedObj.anchorNode.parentNode.childNodes;
-            for (var i = 0; i < childNodes.length; i++) {
-                if (childNodes[i] === selectedObj.anchorNode) {
-                    break;
-                }
-                if (childNodes[i].outerHTML)
-                    rangeCount += childNodes[i].outerHTML.length;
-                else if (childNodes[i].nodeType === 3) {
-                    rangeCount += childNodes[i].textContent.length;
-                }
-            }
-            return range.startOffset + rangeCount;
-        }
-        return -1;
-    },
     /**
      * @private
      * @param {integer} keycode
@@ -312,23 +328,9 @@ var MentionManager = Widget.extend({
             this.open = false;
         }
     },
-    /*
-     * Set cursor position after mention is added.
-     * @private
-     * @paran {int} node - id of childnode to set cursor position after it.
-    */
-    _setCursorPosition: function (nodeID) {
-        var range = document.createRange();
-        var selection = window.getSelection();
-        range.setStart(document.getElementById(nodeID).nextSibling, 1);
-        range.collapse(true);
-        selection.removeAllRanges();
-        selection.addRange(range);
-        this.composer.$input.focus();
-    },
-    _validate_selection: function (selection, inputMentions) {
+    _validate_selection: function (selection, input_mentions) {
         var validated_selection = [];
-        _.each(inputMentions, function (mention) {
+        _.each(input_mentions, function (mention) {
             var validated_mention = _.findWhere(selection, {name: mention.slice(1)});
             if (validated_mention) {
                 validated_selection.push(validated_mention);
@@ -337,60 +339,15 @@ var MentionManager = Widget.extend({
         return validated_selection;
     },
 
-    //--------------------------------------------------------------------------
-    // Handlers
-    //--------------------------------------------------------------------------
-
-    /**
-     * after click on mention item it set to a contenteditable div with it's new
-     * cursor postion
-     *
-     * @private
-     * @param {KeyboardEvent} event - to get a current selected mention from
-     *   list and eventlistener.
-     */
-    _onClickMentionItem: function (event) {
-        event.preventDefault();
-
-        var textInput = this.composer.$input.html();
-        var id = $(event.currentTarget).data('id');
-        var selectedSuggestion = _.find(_.flatten(this.get('mention_suggestions')), function (s) {
-            return s.id === id;
+    // Cursor position and selection utils
+    _get_selection_positions: function () {
+        var el = this.composer.$input.get(0);
+        return el ? dom.getSelectionRange(el) : {start: 0, end: 0};
+    },
+    _set_cursor_position: function (pos) {
+        this.composer.$input.each(function (index, elem) {
+            dom.setSelectionRange(elem, {start: pos, end: pos});
         });
-        var substitution = selectedSuggestion.substitution;
-        if (!substitution) { // no substitution string given, so use the mention name instead
-            // replace white spaces with non-breaking spaces to facilitate mentions detection in text
-            selectedSuggestion.name = selectedSuggestion.name.replace(/ /g, NON_BREAKING_SPACE);
-            substitution = _.escape(this.active_listener.delimiter + selectedSuggestion.name);
-        }
-        var getMentionIndex = function (matches, cursorPosition) {
-            for (var i=0; i<matches.length; i++) {
-                if (cursorPosition <= matches[i].index) {
-                    return i;
-                }
-            }
-            return i;
-        };
-
-        // add the selected suggestion to the list
-        if (this.active_listener.selection.length) {
-            // get mention matches (ordered by index in the text)
-            var matches = this._get_match(textInput, this.active_listener);
-            var index = getMentionIndex(matches, this._getSelectionPositions());
-            this.active_listener.selection.splice(index, 0, selectedSuggestion);
-        } else {
-            this.active_listener.selection.push(selectedSuggestion);
-        }
-
-        // update input text, and reset dropdown
-        var cursorPosition = this._getSelectionPositions();
-        var textLeft = textInput.substring(0, cursorPosition-(this.mention_word.length+1));
-        var textRight = textInput.substring(cursorPosition, textInput.length);
-        var nodeID = _.uniqueId('node');
-        var newTextInput = textLeft + "<a id="+ nodeID+">" + substitution + "</a> " + textRight;
-        this.composer.$input.html(newTextInput);
-        this._setCursorPosition(nodeID);
-        this.set('mention_suggestions', []);
     },
 
 });
@@ -398,8 +355,8 @@ var MentionManager = Widget.extend({
 var BasicComposer = Widget.extend({
     template: "mail.ChatComposer",
     events: {
-        "keydown .o_composer_input": "_onKeydown",
-        "keyup .o_composer_input": "_onKeyup",
+        "keydown .o_composer_input textarea": "on_keydown",
+        "keyup .o_composer_input": "on_keyup",
         "change input.o_input_file": "on_attachment_change",
         "click .o_composer_button_send": "send_message",
         "click .o_composer_button_add_attachment": "on_click_add_attachment",
@@ -410,7 +367,6 @@ var BasicComposer = Widget.extend({
         'focusout .o_composer_button_emoji': '_onEmojiButtonFocusout',
         'focus .o_mail_emoji_container .o_mail_emoji': '_onEmojiImageFocus',
         'click .o_mail_emoji_container .o_mail_emoji': '_onEmojiImageClick',
-        'input .o_composer_input': '_removeMention',
     },
     // RPCs done to fetch the mention suggestions are throttled with the following value
     MENTION_THROTTLE: 200,
@@ -487,12 +443,12 @@ var BasicComposer = Widget.extend({
 
         this.$attachment_button = this.$(".o_composer_button_add_attachment");
         this.$attachments_list = this.$('.o_composer_attachments_list');
-        this.$input = this.$('.o_composer_input');
+        this.$input = this.$('.o_composer_input textarea');
         this.$input.focus(function () {
             self.trigger('input_focused');
         });
-        this.$input.html(this.options.default_body);
-        this.$input.css('min-height', this.options.input_min_height);
+        this.$input.val(this.options.default_body);
+        dom.autoresize(this.$input, {parent: this, min_height: this.options.input_min_height});
 
         // Attachments
         $(window).on(this.fileupload_id, this.on_attachment_loaded);
@@ -514,7 +470,7 @@ var BasicComposer = Widget.extend({
         // behavior for the chatter composer
 
         //Removing unwanted extra spaces from message
-        var value = _.escape(this.$input.text()).trim();
+        var value = _.escape(this.$input.val()).trim();
         value = value.replace(/(\r|\n){2,}/g, '<br/><br/>');
         value = value.replace(/(\r|\n)/g, '<br/>');
 
@@ -545,7 +501,7 @@ var BasicComposer = Widget.extend({
 
     clear_composer: function() {
         // Empty input, selected partners and attachments
-        this.$input.html('');
+        this.$input.val('');
         this.mention_manager.reset_selections();
         this.set('attachment_ids', []);
     },
@@ -557,7 +513,7 @@ var BasicComposer = Widget.extend({
     getState: function () {
         return {
             attachments: this.get('attachment_ids'),
-            text: this.$input.html(),
+            text: this.$input.val(),
         };
     },
 
@@ -572,7 +528,7 @@ var BasicComposer = Widget.extend({
 
     setState: function (state) {
         this.set('attachment_ids', state.attachments);
-        this.$input.html(state.text);
+        this.$input.val(state.text);
     },
 
     /**
@@ -581,18 +537,8 @@ var BasicComposer = Widget.extend({
     should_send: function (event) {
         return !event.shiftKey;
     },
-    /**
-     * _onKeydown event is triggered when is key is pressed
-     *      - on UP and DOWN arrow is pressed then event prevents it's default
-     *              behaviour if mention manager is open else it break it.
-     *      - on ENTER key is pressed and mention manager is open then event
-     *              prevents it's default behaviour else check if ControlKey is
-     *              pressed or not if yes then it send a message
-     *
-     * @private
-     * @param {KeyboardEvent} event
-    */
-    _onKeydown: function (event) {
+
+    on_keydown: function (event) {
         switch(event.which) {
             // UP, DOWN, TAB: prevent moving cursor if navigation in mention propositions
             case $.ui.keyCode.UP:
@@ -617,16 +563,7 @@ var BasicComposer = Widget.extend({
         }
     },
 
-    /**
-     * _onKeyup event is triggered when key is released.
-     * on ESCAP key it close the mention suggestion dropdown menu.
-     * on ENTER key it selects that mention and add to a content editable div.
-     * on UP or DOWN key it highlights previous or next mention respectively.
-     *
-     * @private
-     * @param {KeyboardEvent} event
-    */
-    _onKeyup: function (event) {
+    on_keyup: function (event) {
         switch(event.which) {
             // ESCAPED KEYS: do nothing
             case $.ui.keyCode.END:
@@ -743,13 +680,6 @@ var BasicComposer = Widget.extend({
             attachments: this.get('attachment_ids'),
         }));
     },
-    // remove mention when user try to edit or remove it.
-    _removeMention: function (event) {
-        var anchorNode = window.getSelection().anchorNode;
-        if (anchorNode.textContent.startsWith('@') && anchorNode.parentNode.tagName === 'A') {
-            anchorNode.parentNode.remove();
-        }
-    },
 
     // Mention
     mention_fetch_throttled: function (model, method, kwargs) {
@@ -835,14 +765,8 @@ var BasicComposer = Widget.extend({
     },
 
     // Others
-    /**
-     * used to check if contenteditable div is empty or not
-     *
-     * @return - it returns length of attachment and trim content of input box
-     * tp check for empty.
-    */
     is_empty: function () {
-        return !this.$input.text().trim() && !this.$('.o_attachments').children().length;
+        return !this.$input.val().trim() && !this.$('.o_attachments').children().length;
     },
     focus: function () {
         this.$input.focus();
@@ -901,7 +825,7 @@ var BasicComposer = Widget.extend({
         if (this.$emojisContainer.parent().length) {
             this._hideEmojis();
         } else {
-            this.$emojisContainer.appendTo(this.$('.o_composer_container'));
+            this.$emojisContainer.appendTo(this.$('.o_composer'));
         }
     },
     /**
@@ -925,31 +849,6 @@ var BasicComposer = Widget.extend({
     _onEmojiImageFocus: function () {
         clearTimeout(this._hideEmojisTimeout);
     },
-    /**
-     * set cursor position at the end in input box
-     *
-     * @todo move that kind of code in a utility file. Maybe dom.js
-     *
-     * @private
-     * @param {Element} el
-     */
-    _placeCaretAtEnd: function (el) {
-        el.focus();
-        if (typeof window.getSelection !== "undefined"
-                && typeof document.createRange !== "undefined") {
-            var range = document.createRange();
-            range.selectNodeContents(el);
-            range.collapse(false);
-            var sel = window.getSelection();
-            sel.removeAllRanges();
-            sel.addRange(range);
-        } else if (typeof document.body.createTextRange !== "undefined") {
-            var textRange = document.body.createTextRange();
-            textRange.moveToElementText(el);
-            textRange.collapse(false);
-            textRange.select();
-        }
-    },
     /**
      * Called when an emoji is clicked -> adds it in the <input/>, focuses the
      * <input/> and closes the emoji panel.
@@ -958,8 +857,8 @@ var BasicComposer = Widget.extend({
      * @param {Event} ev
      */
     _onEmojiImageClick: function (ev) {
-        this.$input.html(this.$input.html() + " " + $(ev.currentTarget).data('emoji') + " ");
-        this._placeCaretAtEnd(this.$input[0]);
+        this.$input.val(this.$input.val() + " " + $(ev.currentTarget).data('emoji') + " ");
+        this.$input.focus();
         this._hideEmojis();
     },
 });
diff --git a/addons/mail/static/src/less/composer.less b/addons/mail/static/src/less/composer.less
index 976473f6e1e..9213fb6c416 100644
--- a/addons/mail/static/src/less/composer.less
+++ b/addons/mail/static/src/less/composer.less
@@ -10,7 +10,7 @@
         position: relative;
         background: white;
 
-        input {
+        textarea, input {
             border: none;
         }
     }
@@ -27,19 +27,9 @@
     }
 
     .o_composer {
-        .o_composer_input[contenteditable=true]:empty:before {
-            content: attr(placeholder);
-            opacity: 0.4;
-        }
-        .o_composer_input {
-            border: none;
-            box-shadow: none;
-            cursor: text;
-            display: inline-block;
-            height: 100%;
-            padding: 0px 0px @o-mail-chatter-gap;
-            white-space: pre-wrap;
-            word-break: break-all;
+        .o_composer_input > textarea {
+            width: 100%;
+            resize: none;
         }
         .o_composer_mention_dropdown .o_mention_proposition > a {
             .o-text-overflow();
@@ -68,16 +58,17 @@
                 color: @odoo-brand-optional;
             }
         }
-    }
 
-   .o_mail_emoji_container {
-        padding: 0 @o-mail-chatter-gap @o-mail-chatter-gap 0;
-        border: 1px solid @gray-lighter-dark;
-        background-color: @gray-lighter;
+        .o_mail_emoji_container {
+            padding: 0 @o-mail-chatter-gap @o-mail-chatter-gap 0;
+            border: 1px solid @gray-lighter-dark;
+            border-width: 1px 0 0 0;
+            background-color: @gray-lighter;
 
-        .o_mail_emoji {
-            margin: @o-mail-chatter-gap 0 0 @o-mail-chatter-gap;
-            cursor: pointer; // only in the popover
+            .o_mail_emoji {
+                margin: @o-mail-chatter-gap 0 0 @o-mail-chatter-gap;
+                cursor: pointer; // only in the popover
+            }
         }
     }
 
@@ -103,13 +94,19 @@
 
         .o_composer {
             border-radius: 2px;
+            textarea {
+                padding-right: @grid-gutter-width; // avoid overlaps betwenn textarea and o_composer_button_full_composer
+            }
 
+            .o_mail_emoji_container {
+                margin: 0 -@o-mail-chatter-gap;
+            }
         }
 
         .o_composer, .o_composer_subject {
             border: 1px solid @gray-lighter-dark;
 
-            input {
+            textarea, input {
                 padding: 0 0 @o-mail-chatter-gap;
                 border: none;
             }
@@ -121,9 +118,6 @@
 
         .o_chatter_composer_tools {
             border-top: 1px solid @gray-lighter-dark;
-            @media (max-width: @screen-xs-max) {
-                margin-top: 10px;
-            }
         }
 
         &:not(.o_chat_inline_composer) {
@@ -142,24 +136,26 @@
 
         &.o_chat_inline_composer {
             .o_composer_container {
-                .o-flex(1, 1, auto);
+                .o-flex(1, 0, auto);
             }
             .o_composer {
-                display: flex;
-                min-height: 40px;
                 padding: @o-mail-chatter-gap @o-mail-chatter-gap 0 @o-mail-chatter-gap;
                 border-radius: 2px 0 0 2px;
                 border-right-width: 0;
-            }
-            .o_mail_emoji_container {
-                text-align: right;
-                border-width: 1px;
+
+                .o_mail_emoji_container {
+                    text-align: right;
+                    border-right-width: 1px;
+                }
             }
             .o_composer_input {
+                .o-flex-display();
                 .o-flex-flow(row, wrap);
             }
             .o_composer_text_field {
                 .o-flex(1, 1, 50%);
+                margin: 0;
+                padding: 0;
             }
             .o_chatter_composer_tools {
                 .o-flex(0, 1, auto);
@@ -191,25 +187,32 @@
             border-top: 1px solid @gray-lighter-dark;
             width: 100%;
         }
-        .o_mail_emoji_container {
-            .o-position-absolute(auto, 0, 100%, 0);
-            border-bottom-width: 1px;
+        .o_composer {
+            .o_mail_emoji_container {
+                .o-position-absolute(auto, 0, 100%, 0);
+                border-bottom-width: 1px;
+            }
         }
         .o_composer_input {
+            .o-flex-display();
             .o-flex-flow(row, nowrap);
 
+            textarea.o_composer_text_field {
+                .o-flex(1, 1, auto);
+            }
+
             .o_chatter_composer_tools {
                 .o-flex(0, 0, auto);
             }
+            @media (max-width: @screen-xs-max) {
+                .o_composer_button_send {
+                    display: inline-block;
+                }
+            }
         }
         .o_composer_button_send, .o_chatter_avatar {
             display: none;
         }
-        @media (max-width: @screen-xs-max) {
-            .o_composer_button_send {
-                display: inline-block;
-            }
-        }
     }
 }
 
diff --git a/addons/mail/static/src/less/extended_chat_window.less b/addons/mail/static/src/less/extended_chat_window.less
index fcf92cf052a..3ae73dee861 100644
--- a/addons/mail/static/src/less/extended_chat_window.less
+++ b/addons/mail/static/src/less/extended_chat_window.less
@@ -42,14 +42,10 @@
             }
             .o_chatter_composer_tools {
                 .o-position-absolute(@right: 0px, @top: 0px);
-
-                @media (max-width: @screen-xs-max) {
-                    .o-position-absolute(@right: 6px, @top: 0px);
-                }
                 button {
-                    padding: 8px;
+                    padding: 10px;
                     @media (max-width: @screen-xs-max) {
-                        padding: 7px 6px 0px 6px;
+                        padding: 13px;
                     }
                     &.btn-icon {
                         font-size: 1.3em;
diff --git a/addons/mail/static/src/xml/composer.xml b/addons/mail/static/src/xml/composer.xml
index 2795a0bb724..b46af297928 100644
--- a/addons/mail/static/src/xml/composer.xml
+++ b/addons/mail/static/src/xml/composer.xml
@@ -8,11 +8,13 @@
                  <input tabindex="1" type="text" placeholder="Subject" class="o_input"/>
              </div>
              <div t-attf-class="o_composer #{widget.extended ? 'o_extended_composer' : ''}">
-                <div class="o_composer_input o_composer_text_field form-control" contenteditable="true" placeholder="Write Something..."/>
-                <div class="o_chatter_composer_tools">
-                    <button tabindex="4" class="btn btn-sm btn-icon fa fa-smile-o o_composer_button_emoji" type="button" data-toggle="popover"/>
-                    <button tabindex="5" class="btn btn-sm btn-icon fa fa-paperclip o_composer_button_add_attachment" type="button"/>
-                    <button t-if="widget.options.isMobile" tabindex="3" class="btn btn-sm btn-icon fa fa-paper-plane-o o_composer_button_send" type="button"/>
+                <div class="o_composer_input">
+                    <textarea class="o_input o_composer_text_field" tabindex="2" placeholder="Write something..."/>
+                    <div class="o_chatter_composer_tools">
+                        <button tabindex="4" class="btn btn-sm btn-icon fa fa-smile-o o_composer_button_emoji" type="button" data-toggle="popover"/>
+                        <button tabindex="5" class="btn btn-sm btn-icon fa fa-paperclip o_composer_button_add_attachment" type="button"/>
+                        <button t-if="widget.options.isMobile" tabindex="3" class="btn btn-sm btn-icon fa fa-paper-plane-o o_composer_button_send" type="button"/>
+                    </div>
                 </div>
              </div>
              <div class="o_composer_attachments_list"/>
diff --git a/addons/mail/static/tests/chatter_tests.js b/addons/mail/static/tests/chatter_tests.js
index 03bfc3898ce..f0145f6c85c 100644
--- a/addons/mail/static/tests/chatter_tests.js
+++ b/addons/mail/static/tests/chatter_tests.js
@@ -368,9 +368,7 @@ QUnit.test('kanban activity widget with an activity', function (assert) {
 
 QUnit.test('chatter: post, receive and star messages', function (assert) {
     var done = assert.async();
-    assert.expect(28);
-    
-    var unpatchWindowGetSelection = testUtils.patchWindowGetSelection();
+    assert.expect(27);
 
     var bus = new Bus();
     var BusService = createBusService(bus);
@@ -473,7 +471,7 @@ QUnit.test('chatter: post, receive and star messages', function (assert) {
     // send a message
     form.$('.o_chatter_button_new_message').click();
     assert.ok(!$('.oe_chatter .o_chat_composer').hasClass('o_hidden'), "chatter should be opened");
-    form.$('.oe_chatter .o_composer_text_field:first()').text("My first message");
+    form.$('.oe_chatter .o_composer_text_field:first()').val("My first message");
     form.$('.oe_chatter .o_composer_button_send').click();
     assert.ok($('.oe_chatter .o_chat_composer').hasClass('o_hidden'), "chatter should be closed");
     assert.strictEqual(form.$('.o_thread_message').length, 2, "thread should contain two messages");
@@ -487,7 +485,7 @@ QUnit.test('chatter: post, receive and star messages', function (assert) {
     // log a note
     form.$('.o_chatter_button_log_note').click();
     assert.ok(!$('.oe_chatter .o_chat_composer').hasClass('o_hidden'), "chatter should be opened");
-    form.$('.oe_chatter .o_composer_text_field:first()').text("My first note");
+    form.$('.oe_chatter .o_composer_text_field:first()').val("My first note");
     form.$('.oe_chatter .o_composer_button_send').click();
     assert.ok($('.oe_chatter .o_chat_composer').hasClass('o_hidden'), "chatter should be closed");
     assert.strictEqual(form.$('.o_thread_message').length, 3, "thread should contain three messages");
@@ -513,7 +511,10 @@ QUnit.test('chatter: post, receive and star messages', function (assert) {
     // very basic test of mention
     form.$('.o_chatter_button_new_message').click();
     var $input = form.$('.oe_chatter .o_composer_text_field:first()');
-    $input.text('@');
+    $input.val('@');
+    // the cursor position must be set for the mention manager to detect that we are mentionning
+    $input[0].selectionStart = 1;
+    $input[0].selectionEnd = 1;
     $input.trigger('keyup');
 
     assert.strictEqual(getSuggestionsDef.state(), "pending",
@@ -531,14 +532,10 @@ QUnit.test('chatter: post, receive and star messages', function (assert) {
             assert.strictEqual(form.$('.o_mention_proposition .o_mention_info').text(), '(test@odoo.com)',
                 "suggestion should be displayed correctly");
 
-            $(".o_mention_proposition > a").trigger("click");
-            assert.strictEqual($(".o_composer_input a").length, 1, "mention is 'green' in edit mode");
-
             BasicComposer.prototype.MENTION_THROTTLE = mentionThrottle;
 
             //cleanup
             form.destroy();
-            unpatchWindowGetSelection();
             done();
         });
 });
@@ -597,7 +594,7 @@ QUnit.test('chatter: post a message and switch in edit mode', function (assert)
 
     // send a message
     form.$('.o_chatter_button_new_message').click();
-    form.$('.oe_chatter .o_composer_text_field:first()').text("My first message");
+    form.$('.oe_chatter .o_composer_text_field:first()').val("My first message");
     form.$('.oe_chatter .o_composer_button_send').click();
     assert.strictEqual(form.$('.o_thread_message').length, 1, "thread should contain a message");
     assert.ok(form.$('.o_thread_message:first() .o_thread_message_core').text().indexOf('My first message') >= 0,
diff --git a/addons/mail/static/tests/discuss_tests.js b/addons/mail/static/tests/discuss_tests.js
index 219604d3289..43882a35545 100644
--- a/addons/mail/static/tests/discuss_tests.js
+++ b/addons/mail/static/tests/discuss_tests.js
@@ -14,7 +14,6 @@ var testUtils = require('web.test_utils');
 var BasicComposer = Composers.BasicComposer;
 var createBusService = mailTestUtils.createBusService;
 var createDiscuss = mailTestUtils.createDiscuss;
-var patchWindowGetSelection = testUtils.patchWindowGetSelection;
 
 QUnit.module('mail', {}, function () {
 
@@ -127,14 +126,13 @@ QUnit.test('@ mention in channel', function (assert) {
 
         // click on general
         $general.click();
-        var $input = discuss.$('.o_composer_input').first();
+        var $input = discuss.$('textarea.o_composer_text_field').first();
         assert.ok($input.length, "should display a composer input");
 
         // Simulate '@' typed by user with mocked Window.getSelection
         // Note: focus is needed in order to trigger rpc 'channel_fetch_listeners'
         $input.focus();
-        $input.text("@");
-        var unpatchWindowGetSelection = patchWindowGetSelection();
+        $input.val("@");
         $input.trigger('keyup');
 
         fetchListenersDef
@@ -220,7 +218,7 @@ QUnit.test('@ mention in channel', function (assert) {
                 $input.trigger($.Event('keyup', {which: $.ui.keyCode.ENTER}));
                 assert.strictEqual(discuss.$('.o_mention_proposition').length, 0,
                     "should not have any partner mention proposition after ENTER");
-                assert.strictEqual($input.find('a').text() , "@Admin",
+                assert.strictEqual($input.val().trim() , "@Admin",
                     "should have the correct mention link in the composer input");
 
                 // send message
@@ -239,7 +237,6 @@ QUnit.test('@ mention in channel', function (assert) {
                         // Restore throttles and window.getSelection
                         BasicComposer.prototype.MENTION_THROTTLE = mentionThrottle;
                         ChatManager.prototype.CHANNEL_SEEN_THROTTLE = channelThrottle;
-                        unpatchWindowGetSelection();
                         discuss.destroy();
                         done();
                 });
diff --git a/addons/web/static/tests/helpers/test_utils.js b/addons/web/static/tests/helpers/test_utils.js
index 5b2fdf2e7f6..8ec345124d4 100644
--- a/addons/web/static/tests/helpers/test_utils.js
+++ b/addons/web/static/tests/helpers/test_utils.js
@@ -725,53 +725,6 @@ function patch (target, props) {
         });
     }
 }
-/**
- * In Phantomjs, there is a crash when calling window.getSelection
- * in order for the tests to work, for the specific test that uses it, replace
- * the default window.getSelection by a mock
- * 
- * usage:
- *     QUnit.test('...',function(done){
- *          var unpatchWindowGetSelection = testUtils.patchWindowGetSelection();
- *          
- *          // do something that needs to use window.getSelection()
- *          assert.strictEqual(....);
- *          
- *          // restore the original function
- *          unpatchWindowGetSelection();
- *      
- *          // finish the test
- *          done();
- *     })
- *
- * @returns {function} the unpatch function
- */
-function patchWindowGetSelection() {
-    var originalWindowGetSelection = window.getSelection;
-    window.getSelection = function () {
-        return {
-            removeAllRanges: function () {},
-            addRange: function (range) {},
-            getRangeAt: function (index) {
-                return {
-                    startOffset : 0
-                };
-            },
-            anchorNode: {
-                parentNode: {
-                    childNodes: [{
-                        outerHTML: "@",
-                        nodeType: 3,
-                        textContent: '@',
-                    }],
-                },
-            },
-        };
-    };
-    return function () {
-        window.getSelection = originalWindowGetSelection;
-    };
-}
 
 /**
  * Unpatches a given Class or Object.
@@ -823,7 +776,6 @@ return $.when(
         intercept: intercept,
         observe: observe,
         patch: patch,
-        patchWindowGetSelection: patchWindowGetSelection,
         removeSrcAttribute: removeSrcAttribute,
         triggerKeypressEvent: triggerKeypressEvent,
         triggerMouseEvent: triggerMouseEvent,

From 0984b2aadb0156e1f742f0bf14f8d36b6d170f23 Mon Sep 17 00:00:00 2001
From: Yannick Tivisse <yti@odoo.com>
Date: Wed, 16 May 2018 15:11:42 +0200
Subject: [PATCH 35/51] [FIX] l10n_be_hr_payroll: Compute correcty employer
 cost for warrants

---
 addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py b/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py
index cf9901281c5..2ec6e172ee1 100644
--- a/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py
+++ b/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py
@@ -126,7 +126,7 @@ class HrContract(models.Model):
     @api.depends('commission_on_target')
     def _compute_warrants_cost(self):
         for contract in self:
-            contract.warrants_cost = contract.commission_on_target * 1.326 * 1.05 * 12.0
+            contract.warrants_cost = contract.commission_on_target * 1.326 / 1.05 * 12.0
             contract.warrant_value_employee = contract.commission_on_target * 1.326 * (1.00 - 0.535) * 12.0
 
     @api.depends('wage', 'fuel_card', 'representation_fees', 'transport_employer_cost',

From 69714fbeee479cd3e0f89de39b3687c183791fc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Doll=C3=A9?= <xdo@odoo.com>
Date: Wed, 16 May 2018 12:53:32 +0200
Subject: [PATCH 36/51] [FIX] mail: correctly filter needaction on unread
 notifications in message_format

Previously to this commit needaction used by JS was not taking into account
read notifications. It means notably Inbox counter could be higher than
expected as taking into account read messages while Inbox displays only
unread messages. This commit fixes that by checking notification state when
giving needaction_partner_ids to message_format result.

This fix has a small impact on performances as message_format is used in
notification process for chat or push. A better implementation of message
format and its postprocess could probably lessen this fix impact. As we
target stable version we avoid rewriting other part of the code. Optimization
will be done in development version.

Related to task ID 1841243.
---
 addons/mail/models/mail_message.py         |  2 +-
 addons/test_mail/tests/test_performance.py | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/mail/models/mail_message.py b/addons/mail/models/mail_message.py
index 89e4237c8e1..cee1c692632 100644
--- a/addons/mail/models/mail_message.py
+++ b/addons/mail/models/mail_message.py
@@ -401,7 +401,6 @@ class Message(models.Model):
             'message_type', 'subtype_id', 'subject',  # message specific
             'model', 'res_id', 'record_name',  # document related
             'channel_ids', 'partner_ids',  # recipients
-            'needaction_partner_ids',  # list of partner ids for whom the message is a needaction
             'starred_partner_ids',  # list of partner ids for whom the message is starred
         ])
         message_tree = dict((m.id, m) for m in self.sudo())
@@ -414,6 +413,7 @@ class Message(models.Model):
         subtypes_dict = dict((subtype['id'], subtype) for subtype in subtypes)
         xml_comment_id = self.env.ref('mail.mt_comment').id
         for message in message_values:
+            message['needaction_partner_ids'] = self.env['mail.notification'].sudo().search([('mail_message_id', '=', message['id']), ('is_read', '=', False)]).mapped('res_partner_id').ids
             message['is_note'] = message['subtype_id'] and subtypes_dict[message['subtype_id'][0]]['internal']
             message['is_discussion'] = message['subtype_id'] and subtypes_dict[message['subtype_id'][0]]['id'] == xml_comment_id
             message['subtype_description'] = message['subtype_id'] and subtypes_dict[message['subtype_id'][0]]['description']
diff --git a/addons/test_mail/tests/test_performance.py b/addons/test_mail/tests/test_performance.py
index d6e272bf0aa..f4c006c9662 100644
--- a/addons/test_mail/tests/test_performance.py
+++ b/addons/test_mail/tests/test_performance.py
@@ -167,7 +167,7 @@ class TestAdvMailPerformance(TransactionCase):
                 'activity_type_id': self.env.ref('mail.mail_activity_data_todo').id,
             })
 
-        with self.assertQueryCount(margin=1, admin=84, emp=115):  # com runbot 84 - 116 // test_mail only: 68 - 96
+        with self.assertQueryCount(margin=1, admin=86, emp=115):  # com runbot 86 - 116 // test_mail only: 70 - 96
             activity.action_feedback(feedback='Zizisse Done !')
 
     @mute_logger('odoo.addons.mail.models.mail_mail', 'odoo.models.unlink')
@@ -207,7 +207,7 @@ class TestAdvMailPerformance(TransactionCase):
     def test_message_log_with_post(self):
         record = self.env['mail.test.simple'].create({'name': 'Test'})
 
-        with self.assertQueryCount(admin=31, emp=43):  # test_mail only: 29 - 40
+        with self.assertQueryCount(admin=33, emp=46):  # com runbot: 33 - 43 // test_mail only: 31 - 43
             record.message_post(
                 body='<p>Test message_post as log</p>',
                 subtype='mail.mt_note',
@@ -218,7 +218,7 @@ class TestAdvMailPerformance(TransactionCase):
     def test_message_post_no_notification(self):
         record = self.env['mail.test.simple'].create({'name': 'Test'})
 
-        with self.assertQueryCount(admin=31, emp=43):  # test_mail only: 29 - 40
+        with self.assertQueryCount(admin=33, emp=46):  # com runbot: 33 - 43 // test_mail only: 31 - 43
             record.message_post(
                 body='<p>Test Post Performances basic</p>',
                 partner_ids=[],
@@ -231,7 +231,7 @@ class TestAdvMailPerformance(TransactionCase):
     def test_message_post_one_email_notification(self):
         record = self.env['mail.test.simple'].create({'name': 'Test'})
 
-        with self.assertQueryCount(margin=1, admin=85, emp=114):  # com runbot 83 - 112 // test_mail only: 81 - 110
+        with self.assertQueryCount(margin=1, admin=87, emp=116):  # com runbot 85 - 112 // test_mail only: 83 - 112
             record.message_post(
                 body='<p>Test Post Performances with an email ping</p>',
                 partner_ids=self.customer.ids,
@@ -243,7 +243,7 @@ class TestAdvMailPerformance(TransactionCase):
     def test_message_post_one_inbox_notification(self):
         record = self.env['mail.test.simple'].create({'name': 'Test'})
 
-        with self.assertQueryCount(margin=1, admin=44, emp=57):  # com runbot 42 - 55 // test_mail only: 42 - 55
+        with self.assertQueryCount(margin=1, admin=46, emp=59):  # com runbot 44 - 55 // test_mail only: 44 - 57
             record.message_post(
                 body='<p>Test Post Performances with an inbox ping</p>',
                 partner_ids=self.user_test.partner_id.ids,
@@ -366,7 +366,7 @@ class TestHeavyMailPerformance(TransactionCase):
         self.umbrella.message_subscribe(self.user_portal.partner_id.ids)
         record = self.umbrella.sudo(self.env.user)
 
-        with self.assertQueryCount(admin=124, emp=157):  # com runbot 122 - 155 // test_mail only: 118 - 150
+        with self.assertQueryCount(admin=126, emp=161):  # com runbot 124 - 155 // test_mail only: 120 - 154
             record.message_post(
                 body='<p>Test Post Performances</p>',
                 message_type='comment',
@@ -383,7 +383,7 @@ class TestHeavyMailPerformance(TransactionCase):
         record = self.umbrella.sudo(self.env.user)
         template_id = self.env.ref('test_mail.mail_test_tpl').id
 
-        with self.assertQueryCount(admin=149, emp=197):  # com runbot 147 - 195 // test_mail only: 141 - 187
+        with self.assertQueryCount(admin=151, emp=201):  # com runbot 149 - 195 // test_mail only: 143 - 191
             record.message_post_with_template(template_id, message_type='comment', composition_mode='comment')
 
         self.assertEqual(record.message_ids[0].body, '<p>Adding stuff on %s</p>' % record.name)
@@ -478,7 +478,7 @@ class TestHeavyMailPerformance(TransactionCase):
         customer_id = self.customer.id
         user_id = self.user_portal.id
 
-        with self.assertQueryCount(admin=325, emp=389):  # test_mail only: 308 - 368
+        with self.assertQueryCount(admin=327, emp=389):  # test_mail only: 310 - 368
             rec = self.env['mail.test.full'].create({
                 'name': 'Test',
                 'umbrella_id': umbrella_id,
@@ -507,7 +507,7 @@ class TestHeavyMailPerformance(TransactionCase):
         })
         self.assertEqual(rec.message_partner_ids, self.user_portal.partner_id | self.env.user.partner_id)
 
-        with self.assertQueryCount(admin=236, emp=275):  # test_mail only: 230 - 268
+        with self.assertQueryCount(admin=238, emp=275):  # test_mail only: 232 - 268
             rec.write({
                 'name': 'Test2',
                 'umbrella_id': self.umbrella.id,
@@ -545,7 +545,7 @@ class TestHeavyMailPerformance(TransactionCase):
         })
         self.assertEqual(rec.message_partner_ids, self.user_portal.partner_id | self.env.user.partner_id)
 
-        with self.assertQueryCount(admin=239, emp=279):  # test_mail only: 233 - 271
+        with self.assertQueryCount(admin=241, emp=279):  # test_mail only: 235 - 271
             rec.write({
                 'name': 'Test2',
                 'umbrella_id': umbrella_id,

From 19fb650863f11172c8a6839fcc10919e9ca9977b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Doll=C3=A9?= <xdo@odoo.com>
Date: Wed, 16 May 2018 12:53:32 +0200
Subject: [PATCH 37/51] [FIX] mail: correctly filter needaction on unread
 notifications in message_format

Previously to this commit needaction used by JS was not taking into account
read notifications. It means notably Inbox counter could be higher than
expected as taking into account read messages while Inbox displays only
unread messages. This commit fixes that by checking notification state when
giving needaction_partner_ids to message_format result.

This fix has a small impact on performances as message_format is used in
notification process for chat or push. A better implementation of message
format and its postprocess could probably lessen this fix impact. As we
target stable version we avoid rewriting other part of the code. Optimization
will be done in development version.

Related to task ID 1841243. This is a manual backport of commit 69714fbeee479cd3e0f89de39b3687c183791fc0
done in saas-11.2.
---
 addons/mail/models/mail_message.py                     | 2 +-
 odoo/addons/test_performance/tests/test_performance.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/mail/models/mail_message.py b/addons/mail/models/mail_message.py
index 62f0f524ebf..01bc5e71a5a 100644
--- a/addons/mail/models/mail_message.py
+++ b/addons/mail/models/mail_message.py
@@ -411,7 +411,6 @@ class Message(models.Model):
             'message_type', 'subtype_id', 'subject',  # message specific
             'model', 'res_id', 'record_name',  # document related
             'channel_ids', 'partner_ids',  # recipients
-            'needaction_partner_ids',  # list of partner ids for whom the message is a needaction
             'starred_partner_ids',  # list of partner ids for whom the message is starred
         ])
         message_tree = dict((m.id, m) for m in self.sudo())
@@ -423,6 +422,7 @@ class Message(models.Model):
         subtypes = self.env['mail.message.subtype'].sudo().browse(subtype_ids).read(['internal', 'description'])
         subtypes_dict = dict((subtype['id'], subtype) for subtype in subtypes)
         for message in message_values:
+            message['needaction_partner_ids'] = self.env['mail.notification'].sudo().search([('mail_message_id', '=', message['id']), ('is_read', '=', False)]).mapped('res_partner_id').ids
             message['is_note'] = message['subtype_id'] and subtypes_dict[message['subtype_id'][0]]['internal']
             message['subtype_description'] = message['subtype_id'] and subtypes_dict[message['subtype_id'][0]]['description']
             if message['model'] and self.env[message['model']]._original_module:
diff --git a/odoo/addons/test_performance/tests/test_performance.py b/odoo/addons/test_performance/tests/test_performance.py
index ef4089a8fdc..d05c006d451 100644
--- a/odoo/addons/test_performance/tests/test_performance.py
+++ b/odoo/addons/test_performance/tests/test_performance.py
@@ -141,7 +141,7 @@ class TestPerformance(TransactionCase):
 
         records.write({'value': self.int(20)})
 
-    @queryCount(admin=33, demo=47)
+    @queryCount(admin=35, demo=47)
     def test_write_mail_with_tracking(self):
         """ Write records inheriting from 'mail.thread' (with field tracking). """
         record = self.env['test_performance.mail'].search([], limit=1)
@@ -180,7 +180,7 @@ class TestPerformance(TransactionCase):
         model = self.env['test_performance.mail']
         model.with_context(tracking_disable=True).create({'name': self.str('X')})
 
-    @queryCount(admin=63, demo=85)
+    @queryCount(admin=67, demo=85)
     def test_create_mail_with_tracking(self):
         """ Create records inheriting from 'mail.thread' (with field tracking). """
         model = self.env['test_performance.mail']

From bcf20cfbecf6850256ad2d542bc3cac75a42dad8 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@odoo.com>
Date: Mon, 14 May 2018 16:58:21 +0200
Subject: [PATCH 38/51] [FIX] stock: use timedelta instead of relativedelta

Suppose we have a delta between two datetimes:

    delta = dt1 - dt0

If delta is negative but less than a day, ``delta.days`` returns -1 (which is
compensated by positive seconds).  In order to avoid this surprising effect,
use ``delta.total_seconds()`` to compute the number of days.
---
 addons/stock/models/stock_move.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/stock/models/stock_move.py b/addons/stock/models/stock_move.py
index c5f8e54d984..a0f774109e1 100644
--- a/addons/stock/models/stock_move.py
+++ b/addons/stock/models/stock_move.py
@@ -288,10 +288,10 @@ class StockMove(models.Model):
                     if propagated_date_field:
                         current_date = datetime.strptime(move.date_expected, DEFAULT_SERVER_DATETIME_FORMAT)
                         new_date = datetime.strptime(vals.get(propagated_date_field), DEFAULT_SERVER_DATETIME_FORMAT)
-                        delta = relativedelta.relativedelta(new_date, current_date)
-                        if abs(delta.days) >= move.company_id.propagation_minimum_delta:
+                        delta_days = (new_date - current_date).total_seconds() / 86400
+                        if abs(delta_days) >= move.company_id.propagation_minimum_delta:
                             old_move_date = datetime.strptime(move.move_dest_id.date_expected, DEFAULT_SERVER_DATETIME_FORMAT)
-                            new_move_date = (old_move_date + relativedelta.relativedelta(days=delta.days or 0)).strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+                            new_move_date = (old_move_date + relativedelta.relativedelta(days=delta_days or 0)).strftime(DEFAULT_SERVER_DATETIME_FORMAT)
                             propagated_changes_dict['date_expected'] = new_move_date
                     #For pushed moves as well as for pulled moves, propagate by recursive call of write().
                     #Note that, for pulled moves we intentionally don't propagate on the procurement.

From adfab80c1742a5fb96023742d28d79e0b44c9d40 Mon Sep 17 00:00:00 2001
From: Toufik Benjaa <tbe@odoo.com>
Date: Wed, 16 May 2018 14:54:55 +0200
Subject: [PATCH 39/51] [FIX] account: If set, use analytic account's company
 on line creation

- When creating analytic account lines when posting account moves, the lines' company id were set to the current user's company.
  If the analytic account has a company set, the lines must be set on the same company (due to a python constraint).

  So when creating the lines, we now check if the analytic account has a company, if so, we use it to create the lines.
---
 addons/account/models/account_move.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
index 3cd6bae78ea..1ae10f364c9 100644
--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
@@ -1509,7 +1509,7 @@ class AccountMoveLine(models.Model):
             'move_id': self.id,
             'user_id': self.invoice_id.user_id.id or self._uid,
             'partner_id': self.partner_id.id,
-            'company_id': self.env.user.company_id.id,
+            'company_id': self.analytic_account_id.company_id.id or self.env.user.company_id.id,
         }
 
     def _prepare_analytic_distribution_line(self, distribution):
@@ -1532,7 +1532,7 @@ class AccountMoveLine(models.Model):
             'ref': self.ref,
             'move_id': self.id,
             'user_id': self.invoice_id.user_id.id or self._uid,
-            'company_id': self.env.user.company_id.id
+            'company_id': distribution.account_id.company_id.id or self.env.user.company_id.id,
         }
 
     @api.model

From 86ffb549bf80b054f8bb5131c52d3e7757accb29 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@odoo.com>
Date: Wed, 16 May 2018 16:12:53 +0200
Subject: [PATCH 40/51] [FIX] base: log failed/successful logins with ip

We used to only log failed logins, and did not include the IP, which
makes it much less useful for intrusion detections systems (e.g. fail2ban)

For example, the following fail2ban filter definition should match a
failed login (in /etc/fail2ban/filter.d/odoo-login.local):

    [Definition]
    failregex = ^ \d+ INFO \S+ \S+ Login failed for db:\S+ login:\S+ from <HOST>
    ignoreregex =

This could be used with a jail definition to block the IP on HTTP(S).

Here is what it could look like for blocking the IP for 15 minutes when
10 failed login attempts are detected from the same IP within 1 minute:

    [odoo-login]
    enabled = true
    port = http,https
    bantime = 900  ; 15 min ban
    maxretry = 10  ; if 10 attempts
    findtime = 60  ; within 1 min
    logpath = /var/log/odoo.log  ;  set the actual odoo log path here
---
 odoo/addons/base/res/res_users.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/odoo/addons/base/res/res_users.py b/odoo/addons/base/res/res_users.py
index c7dd17ba4c1..8db66e282ec 100644
--- a/odoo/addons/base/res/res_users.py
+++ b/odoo/addons/base/res/res_users.py
@@ -14,6 +14,7 @@ from hashlib import sha256
 
 from odoo import api, fields, models, tools, SUPERUSER_ID, _
 from odoo.exceptions import AccessDenied, AccessError, UserError, ValidationError
+from odoo.http import request
 from odoo.osv import expression
 from odoo.service.db import check_super
 from odoo.tools import partition, pycompat
@@ -467,8 +468,12 @@ class Users(models.Model):
                     user.sudo(user_id).check_credentials(password)
                     user.sudo(user_id)._update_last_login()
         except AccessDenied:
-            _logger.info("Login failed for db:%s login:%s", db, login)
             user_id = False
+
+        status = "successful" if user_id else "failed"
+        ip = request.httprequest.environ['REMOTE_ADDR'] if request else 'n/a'
+        _logger.info("Login %s for db:%s login:%s from %s", status, db, login, ip)
+
         return user_id
 
     @classmethod

From 412892ceaffbd6e3d6386eea434ccf63b7bf755b Mon Sep 17 00:00:00 2001
From: Toufik Benjaa <tbe@odoo.com>
Date: Wed, 16 May 2018 17:41:15 +0200
Subject: [PATCH 41/51] [FIX] hr_timesheet: Use correct company_id on timesheet
 analytic line

- When changing the project_id of an analytic line, the account_id is updated to the project's one, we need to update the company_id according the one set on project's analytic account.
---
 addons/hr_timesheet/models/project.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/hr_timesheet/models/project.py b/addons/hr_timesheet/models/project.py
index 72a88277886..c88aa12c864 100644
--- a/addons/hr_timesheet/models/project.py
+++ b/addons/hr_timesheet/models/project.py
@@ -61,8 +61,10 @@ class Task(models.Model):
             # a timesheet must have an analytic account (and a project)
             if self and not project_id:
                 raise UserError(_('This task must have a project since they are linked to timesheets.'))
+            account_id = self.env['project.project'].browse(project_id).sudo().analytic_account_id
             self.sudo().mapped('timesheet_ids').write({
                 'project_id': project_id,
-                'account_id': self.env['project.project'].browse(project_id).sudo().analytic_account_id.id
+                'account_id': account_id.id,
+                'company_id': account_id.company_id.id,
             })
         return result

From f3229be332d8d1b664980df4d7a17905e7573fbd Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Wed, 16 May 2018 17:10:54 +0200
Subject: [PATCH 42/51] [FIX] website_sale: move font-awesome inside the link

It sounds like a bad id to mix fa class with others class.
Some css rule change the style (eg: font family) for other class
and fa become ugly or just a square.
---
 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 770ee2a9c4e..5d1e6a8c833 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -1093,7 +1093,7 @@
                 </t>
                 <input type='submit'/>
             </form>
-            <a t-if="not actual_partner or (ship.id in actual_partner.ids + actual_partner.child_ids.ids)" class='btn btn-link pull-right fa fa-edit js_edit_address no-decoration' title="Edit this address"></a>
+            <a t-if="not actual_partner or (ship.id in actual_partner.ids + actual_partner.child_ids.ids)" class='btn btn-link pull-right js_edit_address no-decoration' title="Edit this address"><i class='fa fa-edit'/></a>
             <div t-att-class="'panel panel-default %s' % (selected and 'border_primary' or 'js_change_shipping')">
                 <div class='panel-body' style='min-height: 130px;'>
                     <t t-esc="contact" t-options="dict(widget='contact', fields=['name', 'address'], no_marker=True)"/>

From 59a04f151083be086fe60ad5c6529097f4ad0933 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Wed, 16 May 2018 17:57:29 +0200
Subject: [PATCH 43/51] [FIX] portal: search by - add margin

before this commit, carret touch the label
---
 addons/portal/views/portal_templates.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/portal/views/portal_templates.xml b/addons/portal/views/portal_templates.xml
index a242c9ef9ce..cf22a0a1747 100644
--- a/addons/portal/views/portal_templates.xml
+++ b/addons/portal/views/portal_templates.xml
@@ -217,7 +217,7 @@
                          <div class="input-group">
                             <div class="input-group-btn">
                                 <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                                    <span id="search_label" class="hidden-xs">Search</span><span class="caret"></span>
+                                    <span id="search_label" class="hidden-xs mr4">Search</span><span class="caret"></span>
                                 </button>
                                 <ul class="dropdown-menu" role="menu">
                                     <li t-foreach='searchbar_inputs' t-as='input' t-att-class="search_in == searchbar_inputs[input]['input'] and 'active'">

From 65a589eb54a1421baa71074701bea2873a83c75f Mon Sep 17 00:00:00 2001
From: Joren Van Onder <jov@odoo.com>
Date: Fri, 11 May 2018 14:01:07 -0700
Subject: [PATCH 44/51] [FIX] website_quote: make 'Pay & Confirm' work without
 website_sale

When creating a db with only website_quote and payment_paypal you end
up with:

AttributeError: 'payment.transaction' object has no attribute '_check_or_create_sale_tx'

when clicking on 'Pay & Confirm' in an online quote.

This is because various controller methods in website_quote use this
method and it is defined by the sale_payment module.

opw-1847977
---
 addons/website_quote/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_quote/__manifest__.py b/addons/website_quote/__manifest__.py
index e6a0a1c274f..115f8f6821d 100644
--- a/addons/website_quote/__manifest__.py
+++ b/addons/website_quote/__manifest__.py
@@ -7,7 +7,7 @@
     'website': 'https://www.odoo.com/page/quote-builder',
     'version': '1.0',
     'description': "",
-    'depends': ['website', 'sale_management', 'mail', 'payment', 'website_mail'],
+    'depends': ['website', 'sale_management', 'mail', 'payment', 'website_mail', 'sale_payment'],
     'data': [
         'data/website_quote_data.xml',
         'report/sale_order_reports.xml',

From 507b5cce3ae848d4b22b401f45d346f66e8fc45d Mon Sep 17 00:00:00 2001
From: "Lucas Perais (lpe)" <lpe@odoo.com>
Date: Wed, 16 May 2018 14:28:49 +0200
Subject: [PATCH 45/51] [FIX] point_of_sale: repair cashier from localStorage
 on refresh page

open a pos,
change cashier
hit F5

Before this commit, the previous user was set as cashier, forgetting about the change we made
This was because of two things:
- The original fix to do just this use case was pushed in v9.0 as e14ab697727d87773dbefba11453b9edca79fc68
- In v11.0 the commit f5f60599bfd49df5904f971b0f1bbb37a96ccdbe introduced full usage of Backbone's set and get
    which meant that self.cashier was no longer relevant
- In v10.0 the commit 475027b9889c0701f8fe5e0373a40663f6a831e1
    (For v11.0: a9caef0ebbc7f3288e06f352f5bb817861e9689c)
    Was intended to update the res.users objects at their loading to ensure that their access rights were loaded too
    But it did this using the wrong condition

After this commit, it reworks fine

OPW 1844006
closes #24762
---
 addons/point_of_sale/static/src/js/models.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index 24443942ba5..1e5fa2e937b 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -259,6 +259,7 @@ exports.PosModel = Backbone.Model.extend({
             // we attribute a role to the user, 'cashier' or 'manager', depending
             // on the group the user belongs.
             var pos_users = [];
+            var current_cashier = self.get_cashier();
             for (var i = 0; i < users.length; i++) {
                 var user = users[i];
                 for (var j = 0; j < user.groups_id.length; j++) {
@@ -276,6 +277,8 @@ exports.PosModel = Backbone.Model.extend({
                 // replace the current user with its updated version
                 if (user.id === self.user.id) {
                     self.user = user;
+                }
+                if (user.id === current_cashier.id) {
                     self.set_cashier(user);
                 }
             }
@@ -629,7 +632,7 @@ exports.PosModel = Backbone.Model.extend({
     // changes the current cashier
     set_cashier: function(user){
         this.set('cashier', user);
-        this.db.set_cashier(this.cashier);
+        this.db.set_cashier(this.get('cashier'));
     },
     //creates a new empty order and sets it as the current order
     add_new_order: function(){

From 77aa313b141b9b4c79fa8e24ed0984a9d5c955fe Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Wed, 16 May 2018 15:20:33 +0200
Subject: [PATCH 46/51] [FIX] mail: XHTML

In case an email received contains XHTML, `fromstring` fails because of
the following error:
> Unicode strings with encoding declaration are not supported. Please
> use bytes input or XML fragments without declaration.

opw-1832683
---
 addons/mail/models/mail_thread.py      |   8 +-
 addons/mail/tests/test_mail_gateway.py | 248 +++++++++++++++++++++++++
 2 files changed, 255 insertions(+), 1 deletion(-)

diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py
index 6b41b8769d9..7050f2bfc89 100644
--- a/addons/mail/models/mail_thread.py
+++ b/addons/mail/models/mail_thread.py
@@ -1373,7 +1373,13 @@ class MailThread(models.AbstractModel):
         located in tools. """
         if not body:
             return body, attachments
-        root = lxml.html.fromstring(body)
+        try:
+            root = lxml.html.fromstring(body)
+        except ValueError:
+            # In case the email client sent XHTML, fromstring will fail because 'Unicode strings
+            # with encoding declaration are not supported'.
+            root = lxml.html.fromstring(body.encode('utf-8'))
+
         postprocessed = False
         to_remove = []
         for node in root.iter():
diff --git a/addons/mail/tests/test_mail_gateway.py b/addons/mail/tests/test_mail_gateway.py
index 12eac4437ac..93d873ce0cc 100644
--- a/addons/mail/tests/test_mail_gateway.py
+++ b/addons/mail/tests/test_mail_gateway.py
@@ -439,6 +439,248 @@ Web: <a class="moz-txt-link-freetext" href="http://www.odoo.com">http://www.odoo
 
 --------------A6B5FD5F68F4D73ECD739009--"""
 
+
+MAIL_XHTML = """Return-Path: <xxxx@xxxx.com>
+Received: from xxxx.internal (xxxx.xxxx.internal [1.1.1.1])
+	 by xxxx (xxxx 1.1.1-111-g972eecc-slipenbois) with LMTPA;
+	 Fri, 13 Apr 2018 22:11:52 -0400
+X-Cyrus-Session-Id: sloti35d1t38-1111111-11111111111-5-11111111111111111111
+X-Sieve: CMU Sieve 1.0
+X-Spam-known-sender: no ("Email failed DMARC policy for domain"); in-addressbook
+X-Spam-score: 0.0
+X-Spam-hits: ALL_TRUSTED -1, BAYES_00 -1.9, FREEMAIL_FROM 0.001,
+  HTML_FONT_LOW_CONTRAST 0.001, HTML_MESSAGE 0.001, SPF_SOFTFAIL 0.665,
+  LANGUAGES en, BAYES_USED global, SA_VERSION 1.1.0
+X-Spam-source: IP='1.1.1.1', Host='unk', Country='unk', FromHeader='com',
+  MailFrom='com'
+X-Spam-charsets: plain='utf-8', html='utf-8'
+X-IgnoreVacation: yes ("Email failed DMARC policy for domain")
+X-Resolved-to: catchall@xxxx.xxxx
+X-Delivered-to: catchall@xxxx.xxxx
+X-Mail-from: xxxx@xxxx.com
+Received: from mx4 ([1.1.1.1])
+  by xxxx.internal (LMTPProxy); Fri, 13 Apr 2018 22:11:52 -0400
+Received: from xxxx.xxxx.com (localhost [127.0.0.1])
+	by xxxx.xxxx.internal (Postfix) with ESMTP id E1111C1111;
+	Fri, 13 Apr 2018 22:11:51 -0400 (EDT)
+Received: from xxxx.xxxx.internal (localhost [127.0.0.1])
+    by xxxx.xxxx.com (Authentication Milter) with ESMTP
+    id BBDD1111D1A;
+    Fri, 13 Apr 2018 22:11:51 -0400
+ARC-Authentication-Results: i=1; xxxx.xxxx.com; arc=none (no signatures found);
+    dkim=pass (2048-bit rsa key sha256) header.d=xxxx.com header.i=@xxxx.com header.b=P1aaAAaa x-bits=2048 x-keytype=rsa x-algorithm=sha256 x-selector=fm2;
+    dmarc=fail (p=none,d=none) header.from=xxxx.com;
+    iprev=pass policy.iprev=1.1.1.1 (out1-smtp.xxxx.com);
+    spf=softfail smtp.mailfrom=xxxx@xxxx.com smtp.helo=out1-smtp.xxxx.com;
+    x-aligned-from=pass (Address match);
+    x-cm=none score=0;
+    x-ptr=pass x-ptr-helo=out1-smtp.xxxx.com x-ptr-lookup=out1-smtp.xxxx.com;
+    x-return-mx=pass smtp.domain=xxxx.com smtp.result=pass smtp_is_org_domain=yes header.domain=xxxx.com header.result=pass header_is_org_domain=yes;
+    x-tls=pass version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128;
+    x-vs=clean score=0 state=0
+Authentication-Results: xxxx.xxxx.com;
+    arc=none (no signatures found);
+    dkim=pass (2048-bit rsa key sha256) header.d=xxxx.com header.i=@xxxx.com header.b=P1awJPiy x-bits=2048 x-keytype=rsa x-algorithm=sha256 x-selector=fm2;
+    dmarc=fail (p=none,d=none) header.from=xxxx.com;
+    iprev=pass policy.iprev=66.111.4.25 (out1-smtp.xxxx.com);
+    spf=softfail smtp.mailfrom=xxxx@xxxx.com smtp.helo=out1-smtp.xxxx.com;
+    x-aligned-from=pass (Address match);
+    x-cm=none score=0;
+    x-ptr=pass x-ptr-helo=out1-smtp.xxxx.com x-ptr-lookup=out1-smtp.xxxx.com;
+    x-return-mx=pass smtp.domain=xxxx.com smtp.result=pass smtp_is_org_domain=yes header.domain=xxxx.com header.result=pass header_is_org_domain=yes;
+    x-tls=pass version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128;
+    x-vs=clean score=0 state=0
+X-ME-VSCategory: clean
+X-ME-CMScore: 0
+X-ME-CMCategory: none
+Received-SPF: softfail
+    (gmail.com ... _spf.xxxx.com: Sender is not authorized by default to use 'xxxx@xxxx.com' in 'mfrom' identity, however domain is not currently prepared for false failures (mechanism '~all' matched))
+    receiver=xxxx.xxxx.com;
+    identity=mailfrom;
+    envelope-from="xxxx@xxxx.com";
+    helo=out1-smtp.xxxx.com;
+    client-ip=1.1.1.1
+Received: from xxxx.xxxx.internal (gateway1.xxxx.internal [1.1.1.1])
+	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
+	(No client certificate requested)
+	by xxxx.xxxx.internal (Postfix) with ESMTPS;
+	Fri, 13 Apr 2018 22:11:51 -0400 (EDT)
+Received: from compute3.internal (xxxx.xxxx.internal [10.202.2.43])
+	by xxxx.xxxx.internal (Postfix) with ESMTP id 8BD5B21BBD;
+	Fri, 13 Apr 2018 22:11:51 -0400 (EDT)
+Received: from xxxx ([10.202.2.163])
+  by xxxx.internal (MEProxy); Fri, 13 Apr 2018 22:11:51 -0400
+X-ME-Sender: <xms:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa>
+Received: from [1.1.1.1] (unknown [1.1.1.1])
+	by mail.xxxx.com (Postfix) with ESMTPA id BF5E1111D
+	for <catchall@xxxx.xxxx>; Fri, 13 Apr 2018 22:11:50 -0400 (EDT)
+From: "xxxx xxxx" <xxxx@xxxx.com>
+To: "xxxx" <catchall@xxxx.xxxx>
+Subject: Re: xxxx (Ref PO1)
+Date: Sat, 14 Apr 2018 02:11:42 +0000
+Message-Id: <em67f5c44a-xxxx-xxxx-xxxx-69f56d618a94@wswin7hg4n4l1ce>
+In-Reply-To: <829228111124527.1111111602.256611118262939-openerp-129-xxxx.xxxx@ip-1-1-1-1>
+References: <867911111953277.1523671337.187951111160400-openerp-129-xxxx.xxxx@ip-1-1-1-1>
+ <867911111953277.1523671337.256611118262939-openerp-129-xxxx.xxxx@ip-1-1-1-1>
+Reply-To: "xxxx xxxx" <xxxx@xxxx.com>
+User-Agent: eM_Client/7.0.26687.0
+Mime-Version: 1.0
+Content-Type: multipart/alternative;
+ boundary="------=_MB48E455BD-1111-42EC-1111-886CDF48905E"
+
+--------=_MB48E455BD-1111-42EC-1111-886CDF48905E
+Content-Type: text/plain; format=flowed; charset=utf-8
+Content-Transfer-Encoding: quoted-printable
+
+xxxx
+
+
+------ Original Message ------
+From: "xxxx" <xxxx@xxxx.com>
+To: "xxxx" <xxxx@xxxx.com>
+Sent: 4/13/2018 7:06:43 PM
+Subject: xxxx
+
+>xxxx
+
+--------=_MB48E455BD-1111-42EC-1111-886CDF48905E
+Content-Type: text/html; charset=utf-8
+Content-Transfer-Encoding: quoted-printable
+
+<?xml version=3D"1.0" encoding=3D"utf-16"?><html><head><style type=3D"text/=
+css"><!--blockquote.cite
+{margin-left: 5px; margin-right: 0px; padding-left: 10px; padding-right:=
+ 0px; border-left-width: 1px; border-left-style: solid; border-left-color:=
+ rgb(204, 204, 204);}
+blockquote.cite2
+{margin-left: 5px; margin-right: 0px; padding-left: 10px; padding-right:=
+ 0px; border-left-width: 1px; border-left-style: solid; border-left-color:=
+ rgb(204, 204, 204); margin-top: 3px; padding-top: 0px;}
+a img
+{border: 0px;}
+body
+{font-family: Tahoma; font-size: 12pt;}
+--></style></head><body><div>this is a reply to PO200109 from emClient</div=
+><div id=3D"signature_old"><div style=3D"font-family: Tahoma; font-size:=
+ 12 pt;">-- <br /><span><span class=3D"__postbox-detected-content __postbox=
+-detected-address" style=3D"TEXT-DECORATION: underline; COLOR: rgb(115,133,=
+172); PADDING-BOTTOM: 0pt; PADDING-TOP: 0pt; PADDING-LEFT: 0pt; DISPLAY:=
+ inline; PADDING-RIGHT: 0pt" __postbox-detected-content=3D"__postbox-detect=
+ed-address"></span>xxxx<br />xxxx<br /><b=
+r />xxxx</span></=
+div></div><div><br /></div><div><br /></div><div><br /></div>
+<div>------ Original Message ------</div>
+<div>From: "xxxx" &lt;<a href=3D"mailto:xxxx@xxxx.com">xxxx=
+@xxxx.com</a>&gt;</div>
+<div>To: "xxxx" &lt;<a href=3D"mailto:xxxx@xxxx.com">a=
+xxxx@xxxx.com</a>&gt;</div>
+<div>Sent: 4/13/2018 7:06:43 PM</div>
+<div>Subject: xxxx</div><div><br /></div=
+>
+<div id=3D"x00b4101ba6e64ce"><blockquote cite=3D"829228972724527.1523671602=
+.256660938262939-openerp-129-xxxx.xxxx@ip-1-1-1-1" type=3D"cite"=
+ class=3D"cite2">
+<table border=3D"0" width=3D"100%" cellpadding=3D"0" bgcolor=3D"#ededed"=
+ style=3D"padding: 20px; background-color: #ededed" summary=3D"o_mail_notif=
+ication">
+                    <tbody>
+
+                      <!-- HEADER -->
+                      <tr>
+                        <td align=3D"center" style=3D"min-width: 590px;">
+                          <table width=3D"590" border=3D"0" cellpadding=3D=
+"0" bgcolor=3D"#875A7B" style=3D"min-width: 590px; background-color: rgb(13=
+5,90,123); padding: 20px;">
+                            <tbody><tr>
+                              <td valign=3D"middle">
+                                  <span style=3D"font-size:20px; color:whit=
+e; font-weight: bold;">
+                                      mangez des saucisses
+                                  </span>
+                              </td>
+                              <td valign=3D"middle" align=3D"right">
+                                  <img src=3D"http://erp.xxxx.xxxx/logo.png=
+" style=3D"padding: 0px; margin: 0px; height: auto; width: 80px;" alt=3D=
+"xxxx" />
+                              </td>
+                            </tr>
+                          </tbody></table>
+                        </td>
+                      </tr>
+
+                      <!-- CONTENT -->
+                      <tr>
+                        <td align=3D"center" style=3D"min-width: 590px;">
+                          <table width=3D"590" border=3D"0" cellpadding=3D=
+"0" bgcolor=3D"#ffffff" style=3D"min-width: 590px; background-color: rgb(25=
+5, 255, 255); padding: 20px;">
+                            <tbody>
+                              <tr><td valign=3D"top" style=3D"font-family:A=
+rial,Helvetica,sans-serif; color: #555; font-size: 14px;">
+                                <p style=3D"margin: 0px 0px 9px 0px; font-s=
+ize: 13px; font-family: &quot;Lucida Grande&quot;, Helvetica, Verdana, Aria=
+l, sans-serif">xxxx.=20
+,</p>
+<p style=3D"margin: 0px 0px 9px 0px; font-size: 13px; font-family: &quot;Lu=
+cida Grande&quot;, Helvetica, Verdana, Arial, sans-serif">
+xxxx.
+</p>
+
+<p style=3D"margin: 0px 0px 9px 0px; font-size: 13px; font-family: &quot;Lu=
+cida Grande&quot;, Helvetica, Verdana, Arial, sans-serif">You can reply =
+to this email if you have any questions.</p>
+<p style=3D"margin: 0px 0px 9px 0px; font-size: 13px; font-family: &quot;Lu=
+cida Grande&quot;, Helvetica, Verdana, Arial, sans-serif">Thank you,</p>
+                              </td>
+                            </tr></tbody>
+                          </table>
+                        </td>
+                      </tr>
+
+                      <!-- FOOTER -->
+                      <tr>
+                        <td align=3D"center" style=3D"min-width: 590px;">
+                          <table width=3D"590" border=3D"0" cellpadding=3D=
+"0" bgcolor=3D"#875A7B" style=3D"min-width: 590px; background-color: rgb(13=
+5,90,123); padding: 20px;">
+                            <tbody><tr>
+                              <td valign=3D"middle" align=3D"left" style=
+=3D"color: #fff; padding-top: 10px; padding-bottom: 10px; font-size: 12px;"=
+>
+                                xxxx<br />
+                                +1-801-980-4240
+                              </td>
+                              <td valign=3D"middle" align=3D"right" style=
+=3D"color: #fff; padding-top: 10px; padding-bottom: 10px; font-size: 12px;"=
+>
+                                <a href=3D"http://erp.xxxx.xxxx/info@xxxx-a=
+aa.com" style=3D"text-decoration:none; color: white;">info@aust-mfg.com</a>=
+<br />
+                                    <a href=3D"http://www.xxxx=
+.com" style=3D"text-decoration:none; color: white;">
+                                        http://www.xxxx.com
+                                    </a>
+                              </td>
+                            </tr>
+                          </tbody></table>
+                        </td>
+                      </tr>
+                      <tr>
+                        <td align=3D"center">
+                            Powered by <a href=3D"https://www.odoo.com">Odo=
+o</a>.
+                        </td>
+                      </tr>
+                    </tbody>
+                </table>
+               =20
+                <pre style=3D"white-space: pre-wrap">xxxx.
+</pre>
+</blockquote></div>
+</body></html>
+--------=_MB48E455BD-2850-42EC-B1CA-886CDF48905E--"""
+
+
 class TestMailgateway(TestMail):
 
     def setUp(self):
@@ -512,6 +754,12 @@ class TestMailgateway(TestMail):
         """
         self.env['mail.thread'].message_process('mail.channel', MAIL_EML_ATTACHMENT)
 
+    @mute_logger('odoo.addons.mail.models.mail_thread')
+    def test_message_parse_xhtml(self):
+        """ Test that the parsing of mail with embedded emails as eml(msg) which generates empty attachments, can be processed.
+        """
+        self.env['mail.thread'].message_process('mail.channel', MAIL_XHTML)
+
     @mute_logger('odoo.addons.mail.models.mail_thread')
     def test_message_process_cid(self):
         new_groups = self.format_and_process(MAIL_MULTIPART_IMAGE, subject='My Frogs', to='groups@example.com')

From 935043dda123a030130571a2a4bb45b2b13f145c Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Thu, 17 May 2018 11:37:01 +0200
Subject: [PATCH 47/51] Revert "[FIX] website_quote: make 'Pay & Confirm' work
 without website_sale"

No dependency change in stable version

This reverts commit 65a589eb54a1421baa71074701bea2873a83c75f.
---
 addons/website_quote/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_quote/__manifest__.py b/addons/website_quote/__manifest__.py
index 115f8f6821d..e6a0a1c274f 100644
--- a/addons/website_quote/__manifest__.py
+++ b/addons/website_quote/__manifest__.py
@@ -7,7 +7,7 @@
     'website': 'https://www.odoo.com/page/quote-builder',
     'version': '1.0',
     'description': "",
-    'depends': ['website', 'sale_management', 'mail', 'payment', 'website_mail', 'sale_payment'],
+    'depends': ['website', 'sale_management', 'mail', 'payment', 'website_mail'],
     'data': [
         'data/website_quote_data.xml',
         'report/sale_order_reports.xml',

From fc3177af9eb9355f41955b581149a80c22b8b2b0 Mon Sep 17 00:00:00 2001
From: Toufik Benjaa <tbe@odoo.com>
Date: Thu, 17 May 2018 10:33:12 +0200
Subject: [PATCH 48/51] [FIX] hr_timesheet: Use analytic account company on
 timesheet line

- When creating an analytic line for a timesheet that uses a project linked with an analytic account, we copy the company_id of the account to the line.
---
 addons/hr_timesheet/models/hr_timesheet.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr_timesheet/models/hr_timesheet.py b/addons/hr_timesheet/models/hr_timesheet.py
index fa2ce2b944b..9555d9f5c10 100644
--- a/addons/hr_timesheet/models/hr_timesheet.py
+++ b/addons/hr_timesheet/models/hr_timesheet.py
@@ -65,6 +65,7 @@ class AccountAnalyticLine(models.Model):
         if vals.get('project_id') and not vals.get('account_id'):
             project = self.env['project.project'].browse(vals.get('project_id'))
             vals['account_id'] = project.analytic_account_id.id
+            vals['company_id'] = project.analytic_account_id.company_id.id
         # employee implies user
         if vals.get('employee_id') and not vals.get('user_id'):
             employee = self.env['hr.employee'].browse(vals['employee_id'])

From 0897195f919b67538257e38647c6c9c72258aec1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Thu, 17 May 2018 10:23:49 +0200
Subject: [PATCH 49/51] [FIX] mail: improve implementation of message format
 fix

This is a better implementation of 19fb650863f11172c8a6839fcc10919e9ca9977b. It seems we did not
see the fix was inside a loop meaning not really optimized when thinking about
Inbox fetching a lot of messages.
---
 addons/mail/models/mail_message.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/addons/mail/models/mail_message.py b/addons/mail/models/mail_message.py
index 01bc5e71a5a..69ef327e9ff 100644
--- a/addons/mail/models/mail_message.py
+++ b/addons/mail/models/mail_message.py
@@ -421,8 +421,18 @@ class Message(models.Model):
         subtype_ids = [msg['subtype_id'][0] for msg in message_values if msg['subtype_id']]
         subtypes = self.env['mail.message.subtype'].sudo().browse(subtype_ids).read(['internal', 'description'])
         subtypes_dict = dict((subtype['id'], subtype) for subtype in subtypes)
+
+        # fetch notification status
+        notif_dict = {}
+        notifs = self.env['mail.notification'].sudo().search([('mail_message_id', 'in', list(mid for mid in message_tree)), ('is_read', '=', False)])
+        for notif in notifs:
+            mid = notif.mail_message_id
+            if not notif_dict.get(mid):
+                notif_dict[mid] = {'partner_id': list()}
+            notif_dict[mid]['partner_id'].append(notif.res_partner_id.id)
+
         for message in message_values:
-            message['needaction_partner_ids'] = self.env['mail.notification'].sudo().search([('mail_message_id', '=', message['id']), ('is_read', '=', False)]).mapped('res_partner_id').ids
+            message['needaction_partner_ids'] = notif_dict.get(message['id'])
             message['is_note'] = message['subtype_id'] and subtypes_dict[message['subtype_id'][0]]['internal']
             message['subtype_description'] = message['subtype_id'] and subtypes_dict[message['subtype_id'][0]]['description']
             if message['model'] and self.env[message['model']]._original_module:

From 7313ce7d3c3700bc4184c27c397887824e7fecc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Thu, 17 May 2018 12:34:46 +0200
Subject: [PATCH 50/51] [FIX] mail: correctly fetch needaction partner ids in
 chatter

Why y push too fast.
---
 addons/mail/models/mail_message.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/models/mail_message.py b/addons/mail/models/mail_message.py
index 69ef327e9ff..78959f157fe 100644
--- a/addons/mail/models/mail_message.py
+++ b/addons/mail/models/mail_message.py
@@ -426,13 +426,13 @@ class Message(models.Model):
         notif_dict = {}
         notifs = self.env['mail.notification'].sudo().search([('mail_message_id', 'in', list(mid for mid in message_tree)), ('is_read', '=', False)])
         for notif in notifs:
-            mid = notif.mail_message_id
+            mid = notif.mail_message_id.id
             if not notif_dict.get(mid):
                 notif_dict[mid] = {'partner_id': list()}
             notif_dict[mid]['partner_id'].append(notif.res_partner_id.id)
 
         for message in message_values:
-            message['needaction_partner_ids'] = notif_dict.get(message['id'])
+            message['needaction_partner_ids'] = notif_dict.get(message['id'], dict()).get('partner_id', [])
             message['is_note'] = message['subtype_id'] and subtypes_dict[message['subtype_id'][0]]['internal']
             message['subtype_description'] = message['subtype_id'] and subtypes_dict[message['subtype_id'][0]]['description']
             if message['model'] and self.env[message['model']]._original_module:

From 59a8a1cd8eec1af59df2d62d7c3b10b7cff3dfc9 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Thu, 17 May 2018 12:50:18 +0200
Subject: [PATCH 51/51] [FIX] account: accounting advisers can create taxes

Since revision 4acec418ce1548b404333f0de4a7f57bd803ce9e
it was no longer possible for an accounting adviser
to create taxes.

This is because when creating a taxes,
as the related field `hide_tax_exigibility` wasn't readonly,
it attempted to write on the field
`tax_exigibility` of the model `res.company`,
and the adviser do not has that access right.

There is no reason for this field not to be readonly,
as it is used only to compute an invisible attrs
for the tax form view.

opw-1846265
---
 addons/account/models/account.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/models/account.py b/addons/account/models/account.py
index a39497d7216..4642cacd9b5 100644
--- a/addons/account/models/account.py
+++ b/addons/account/models/account.py
@@ -767,7 +767,7 @@ class AccountTax(models.Model):
     tag_ids = fields.Many2many('account.account.tag', 'account_tax_account_tag', string='Tags', help="Optional tags you may want to assign for custom reporting")
     tax_group_id = fields.Many2one('account.tax.group', string="Tax Group", default=_default_tax_group, required=True)
     # Technical field to make the 'tax_exigibility' field invisible if the same named field is set to false in 'res.company' model
-    hide_tax_exigibility = fields.Boolean(string='Hide Use Cash Basis Option', related='company_id.tax_exigibility')
+    hide_tax_exigibility = fields.Boolean(string='Hide Use Cash Basis Option', related='company_id.tax_exigibility', readonly=True)
     tax_exigibility = fields.Selection(
         [('on_invoice', 'Based on Invoice'),
          ('on_payment', 'Based on Payment'),