diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
index da1641854ac..48425a084f5 100644
--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
@@ -422,7 +422,7 @@ class AccountMoveLine(models.Model):
         help="This field is used for payable and receivable journal entries. You can put the limit date for the payment of this line.")
     date = fields.Date(related='move_id.date', string='Date', index=True, store=True, copy=False)  # related is required
     analytic_line_ids = fields.One2many('account.analytic.line', 'move_id', string='Analytic lines', oldname="analytic_lines")
-    tax_ids = fields.Many2many('account.tax', string='Taxes')
+    tax_ids = fields.Many2many('account.tax', string='Taxes', domain=['|', ('active', '=', False), ('active', '=', True)])
     tax_line_id = fields.Many2one('account.tax', string='Originator tax', ondelete='restrict')
     analytic_account_id = fields.Many2one('account.analytic.account', string='Analytic Account')
     analytic_tag_ids = fields.Many2many('account.analytic.tag', string='Analytic tags')
diff --git a/addons/account/static/src/js/account_reconciliation_widgets.js b/addons/account/static/src/js/account_reconciliation_widgets.js
index 89ff91ee83b..b287a90fa06 100644
--- a/addons/account/static/src/js/account_reconciliation_widgets.js
+++ b/addons/account/static/src/js/account_reconciliation_widgets.js
@@ -1000,7 +1000,7 @@ var abstractReconciliationLine = Widget.extend({
             var tax_id = self.tax_id_field.get("value");
             if (amount && tax_id) {
                 deferred_tax = self.model_tax
-                    .call("json_friendly_compute_all", [[tax_id], amount, self.get("currency_id")])
+                    .call("json_friendly_compute_all", [[tax_id], amount, self.get("currency_id")], {context: {round: true}}) // just as the python will do
                     .then(function(data){
                         line_created_being_edited.length = 1; // remove tax lines
                         line_created_being_edited[0].amount_before_tax = amount;
diff --git a/addons/crm/models/crm_lead.py b/addons/crm/models/crm_lead.py
index cf657f6691d..4ebbc1fe7d7 100644
--- a/addons/crm/models/crm_lead.py
+++ b/addons/crm/models/crm_lead.py
@@ -494,7 +494,8 @@ class Lead(models.Model):
         for field in fields:
             value = getattr(self, field.name, False)
             if field.ttype == 'selection':
-                value = dict(field.get_values(self.env)).get(value, value)
+                selections = self.fields_get()[field.name]['selection']
+                value = next((v[1] for v in selections if v[0] == value), value)
             elif field.ttype == 'many2one':
                 if value:
                     value = value.sudo().name_get()[0][1]
diff --git a/addons/sale/models/sale.py b/addons/sale/models/sale.py
index 5efd9732ce0..3c5a2c5ea09 100644
--- a/addons/sale/models/sale.py
+++ b/addons/sale/models/sale.py
@@ -876,11 +876,11 @@ class SaleOrderLine(models.Model):
         # TO DO: move me in master/saas-16 on sale.order
         if self.order_id.pricelist_id.discount_policy == 'with_discount':
             return product.with_context(pricelist=self.order_id.pricelist_id.id).price
-        final_price, rule_id = self.order_id.pricelist_id.get_product_price_rule(self.product_id, self.product_uom_qty or 1.0, self.order_id.partner_id)
-        context_partner = dict(self.env.context, partner_id=self.order_id.partner_id.id, date=self.order_id.date_order)
-        base_price, currency_id = self.with_context(context_partner)._get_real_price_currency(self.product_id, rule_id, self.product_uom_qty, self.product_uom, self.order_id.pricelist_id.id)
+        product_context = dict(self.env.context, partner_id=self.order_id.partner_id.id, date=self.order_id.date_order, uom=self.product_uom.id)
+        final_price, rule_id = self.order_id.pricelist_id.with_context(product_context).get_product_price_rule(self.product_id, self.product_uom_qty or 1.0, self.order_id.partner_id)
+        base_price, currency_id = self.with_context(product_context)._get_real_price_currency(product, rule_id, self.product_uom_qty, self.product_uom, self.order_id.pricelist_id.id)
         if currency_id != self.order_id.pricelist_id.currency_id.id:
-            base_price = self.env['res.currency'].browse(currency_id).with_context(context_partner).compute(base_price, self.order_id.pricelist_id.currency_id)
+            base_price = self.env['res.currency'].browse(currency_id).with_context(product_context).compute(base_price, self.order_id.pricelist_id.currency_id)
         # negative discounts (= surcharge) are included in the display price
         return max(base_price, final_price)
 
@@ -1025,16 +1025,25 @@ class SaleOrderLine(models.Model):
                 self.env.user.has_group('sale.group_discount_per_so_line')):
             return
 
-        context_partner = dict(self.env.context, partner_id=self.order_id.partner_id.id, date=self.order_id.date_order)
-        pricelist_context = dict(context_partner, uom=self.product_uom.id)
+        product = self.product_id.with_context(
+            lang=self.order_id.partner_id.lang,
+            partner=self.order_id.partner_id.id,
+            quantity=self.product_uom_qty,
+            date=self.order_id.date_order,
+            pricelist=self.order_id.pricelist_id.id,
+            uom=self.product_uom.id,
+            fiscal_position=self.env.context.get('fiscal_position')
+        )
 
-        price, rule_id = self.order_id.pricelist_id.with_context(pricelist_context).get_product_price_rule(self.product_id, self.product_uom_qty or 1.0, self.order_id.partner_id)
-        new_list_price, currency_id = self.with_context(context_partner)._get_real_price_currency(self.product_id, rule_id, self.product_uom_qty, self.product_uom, self.order_id.pricelist_id.id)
+        product_context = dict(self.env.context, partner_id=self.order_id.partner_id.id, date=self.order_id.date_order, uom=self.product_uom.id)
+
+        price, rule_id = self.order_id.pricelist_id.with_context(product_context).get_product_price_rule(self.product_id, self.product_uom_qty or 1.0, self.order_id.partner_id)
+        new_list_price, currency_id = self.with_context(product_context)._get_real_price_currency(product, rule_id, self.product_uom_qty, self.product_uom, self.order_id.pricelist_id.id)
 
         if new_list_price != 0:
             if self.order_id.pricelist_id.currency_id.id != currency_id:
                 # we need new_list_price in the same currency as price, which is in the SO's pricelist's currency
-                new_list_price = self.env['res.currency'].browse(currency_id).with_context(context_partner).compute(new_list_price, self.order_id.pricelist_id.currency_id)
+                new_list_price = self.env['res.currency'].browse(currency_id).with_context(product_context).compute(new_list_price, self.order_id.pricelist_id.currency_id)
             discount = (new_list_price - price) / new_list_price * 100
             if discount > 0:
                 self.discount = discount
diff --git a/addons/sale/tests/test_product_id_change.py b/addons/sale/tests/test_product_id_change.py
index bf61c8d644f..7d440c4c709 100644
--- a/addons/sale/tests/test_product_id_change.py
+++ b/addons/sale/tests/test_product_id_change.py
@@ -116,3 +116,158 @@ class TestOnchangeProductId(TransactionCase):
         so.date_order = '2017-12-30'
         order_line.product_id_change()
         self.assertEqual(order_line.price_unit, 50, "Second date pricelist rule not applied")
+
+    def test_pricelist_uom_discount(self):
+        """ Test prices and discounts are correctly applied based on date and uom"""
+        computer_case = self.env.ref('product.product_product_16')
+        computer_case.list_price = 100
+        partner = self.res_partner_model.create(dict(name="George"))
+        categ_unit_id = self.ref('product.product_uom_unit')
+        goup_discount_id = self.ref('sale.group_discount_per_so_line')
+        self.env.user.write({'groups_id': [(4, goup_discount_id, 0)]})
+        new_uom = self.env['product.uom'].create({
+            'name': '10 units',
+            'factor_inv': 10,
+            'uom_type': 'bigger',
+            'rounding': 1.0,
+            'category_id': categ_unit_id
+        })
+        christmas_pricelist = self.env['product.pricelist'].create({
+            'name': 'Christmas pricelist',
+            'discount_policy': 'without_discount',
+            'item_ids': [(0, 0, {
+                'date_start': "2017-12-01",
+                'date_end': "2017-12-30",
+                'compute_price': 'percentage',
+                'base': 'list_price',
+                'percent_price': 10,
+                'applied_on': '3_global',
+                'name': 'Christmas discount'
+            })]
+        })
+
+        so = self.env['sale.order'].create({
+            'partner_id': partner.id,
+            'date_order': '2017-12-20',
+            'pricelist_id': christmas_pricelist.id,
+        })
+
+        order_line = self.env['sale.order.line'].new({
+            'order_id': so.id,
+            'product_id': computer_case.id,
+        })
+
+        # force compute uom and prices
+        order_line.product_id_change()
+        order_line.product_uom_change()
+        order_line._onchange_discount()
+        self.assertEqual(order_line.price_subtotal, 90, "Christmas discount pricelist rule not applied")
+        self.assertEqual(order_line.discount, 10, "Christmas discount not equalt to 10%")
+        order_line.product_uom = new_uom
+        order_line.product_uom_change()
+        order_line._onchange_discount()
+        self.assertEqual(order_line.price_subtotal, 900, "Christmas discount pricelist rule not applied")
+        self.assertEqual(order_line.discount, 10, "Christmas discount not equalt to 10%")
+
+    def test_pricelist_based_on_other(self):
+        """ Test price and discount are correctly applied with a pricelist based on an other one"""
+        computer_case = self.env.ref('product.product_product_16')
+        computer_case.list_price = 100
+        partner = self.res_partner_model.create(dict(name="George"))
+        categ_unit_id = self.ref('product.product_uom_unit')
+        goup_discount_id = self.ref('sale.group_discount_per_so_line')
+        self.env.user.write({'groups_id': [(4, goup_discount_id, 0)]})
+
+        first_pricelist = self.env['product.pricelist'].create({
+            'name': 'First pricelist',
+            'discount_policy': 'without_discount',
+            'item_ids': [(0, 0, {
+                'compute_price': 'percentage',
+                'base': 'list_price',
+                'percent_price': 10,
+                'applied_on': '3_global',
+                'name': 'First discount'
+            })]
+        })
+
+        second_pricelist = self.env['product.pricelist'].create({
+            'name': 'Second pricelist',
+            'discount_policy': 'without_discount',
+            'item_ids': [(0, 0, {
+                'compute_price': 'formula',
+                'base': 'pricelist',
+                'base_pricelist_id': first_pricelist.id,
+                'price_discount': 10,
+                'applied_on': '3_global',
+                'name': 'Second discount'
+            })]
+        })
+
+        so = self.env['sale.order'].create({
+            'partner_id': partner.id,
+            'date_order': '2018-07-11',
+            'pricelist_id': second_pricelist.id,
+        })
+
+        order_line = self.env['sale.order.line'].new({
+            'order_id': so.id,
+            'product_id': computer_case.id,
+        })
+
+        # force compute uom and prices
+        order_line.product_id_change()
+        order_line._onchange_discount()
+        self.assertEqual(order_line.price_subtotal, 81, "Second pricelist rule not applied")
+        self.assertEqual(order_line.discount, 19, "Second discount not applied")
+
+    def test_pricelist_with_other_currency(self):
+        """ Test prices are correctly applied with a pricelist with an other currency"""
+        computer_case = self.env.ref('product.product_product_16')
+        computer_case.list_price = 100
+        partner = self.res_partner_model.create(dict(name="George"))
+        categ_unit_id = self.ref('product.product_uom_unit')
+        other_currency = self.env['res.currency'].create({'name': 'other currency',
+            'symbol': 'other'})
+        self.env['res.currency.rate'].create({'name': '2018-07-11',
+            'rate': 2.0,
+            'currency_id': other_currency.id,
+            'company_id': self.env.user.company_id.id})
+        new_uom = self.env['product.uom'].create({
+            'name': '10 units',
+            'factor_inv': 10,
+            'uom_type': 'bigger',
+            'rounding': 1.0,
+            'category_id': categ_unit_id
+        })
+
+        # This pricelist doesn't show the discount
+        first_pricelist = self.env['product.pricelist'].create({
+            'name': 'First pricelist',
+            'currency_id': other_currency.id,
+            'discount_policy': 'with_discount',
+            'item_ids': [(0, 0, {
+                'compute_price': 'percentage',
+                'base': 'list_price',
+                'percent_price': 10,
+                'applied_on': '3_global',
+                'name': 'First discount'
+            })]
+        })
+
+        so = self.env['sale.order'].create({
+            'partner_id': partner.id,
+            'date_order': '2018-07-12',
+            'pricelist_id': first_pricelist.id,
+        })
+
+        order_line = self.env['sale.order.line'].new({
+            'order_id': so.id,
+            'product_id': computer_case.id,
+        })
+
+        # force compute uom and prices
+        order_line.product_id_change()
+        self.assertEqual(order_line.price_unit, 180, "First pricelist rule not applied")
+        order_line.product_uom = new_uom
+        order_line.product_uom_change()
+        self.assertEqual(order_line.price_unit, 1800, "First pricelist rule not applied")
diff --git a/addons/stock/report/report_deliveryslip.xml b/addons/stock/report/report_deliveryslip.xml
index 920f9004316..fb8234367ac 100644
--- a/addons/stock/report/report_deliveryslip.xml
+++ b/addons/stock/report/report_deliveryslip.xml
@@ -11,11 +11,11 @@
                             <div>
                                 <span><strong>Customer Address:</strong></span>
                             </div>
-                            <div t-if="o.move_lines and o.move_lines[0].partner_id" name="partner_header">
+                            <div t-if="o.move_lines and o.move_lines[0].partner_id and not o.partner_id" name="partner_header">
                                 <div t-field="o.move_lines[0].partner_id"
                                    t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True}'/>
                             </div>
-                            <div t-if="not (o.move_lines and o.move_lines[0].partner_id) and o.partner_id" name="partner_header">
+                            <div t-if="o.partner_id" name="partner_header">
                                 <div t-field="o.partner_id"
                                    t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True}'/>
                             </div>
diff --git a/addons/website_sale_delivery/models/sale_order.py b/addons/website_sale_delivery/models/sale_order.py
index 63f2f20208b..43aa2f63d86 100644
--- a/addons/website_sale_delivery/models/sale_order.py
+++ b/addons/website_sale_delivery/models/sale_order.py
@@ -95,8 +95,10 @@ class SaleOrder(models.Model):
 
     @api.model
     def _get_errors(self, order):
+        # Do not Forward port in v11.0 as the API was refactored by f9a8c53e485445bc8e3474eb3978b0f83d5645c7
+        has_stockable_products = any(order.order_line.filtered(lambda line: line.product_id.type in ['consu', 'product']))
         errors = super(SaleOrder, self)._get_errors(order)
-        if not order._get_delivery_methods():
+        if not order._get_delivery_methods() and has_stockable_products:
             errors.append(
                 (_('Sorry, we are unable to ship your order'),
                  _('No shipping method is available for your current order and shipping address. '
diff --git a/doc/cla/corporate/vauxoo.md b/doc/cla/corporate/vauxoo.md
index 39129bd0680..2fbdec70f78 100644
--- a/doc/cla/corporate/vauxoo.md
+++ b/doc/cla/corporate/vauxoo.md
@@ -1,4 +1,4 @@
-México, 9-2-2015
+México, 2015-02-09
 
 Vauxoo agrees to the terms of the Odoo Corporate Contributor License Agreement v1.0.
 
diff --git a/odoo/service/security.py b/odoo/service/security.py
index 54d108fb4b1..7fdffe2d647 100644
--- a/odoo/service/security.py
+++ b/odoo/service/security.py
@@ -18,7 +18,8 @@ def compute_session_token(session, env):
 
 def check_session(session, env):
     self = env['res.users'].browse(session.uid)
-    if odoo.tools.misc.consteq(self._compute_session_token(session.sid), session.session_token):
+    expected = self._compute_session_token(session.sid)
+    if expected and odoo.tools.misc.consteq(expected, session.session_token):
         return True
     self._invalidate_session_cache()
     return False