[MERGE] forward port branch 11.0 up to a9a556178d5

5 files changed, 7 insertions, 6 deletions

diff --git a/addons/document/static/src/js/document.js b/addons/document/static/src/js/document.js
index 5c33a3f3cff..b8437d70417 100644
--- a/addons/document/static/src/js/document.js
+++ b/addons/document/static/src/js/document.js
@@ -50,6 +50,7 @@ Sidebar.include({
      * @override
      */
     updateEnv: function (env) {
+        this.env = env;
         var _super = _.bind(this._super, this, env);
         var def = this.hasAttachments ? this._updateAttachments() : $.when();
         def.then(_super);
diff --git a/addons/hw_scale/controllers/main.py b/addons/hw_scale/controllers/main.py
index 162ab7a866d..ed8f92c73ea 100644
--- a/addons/hw_scale/controllers/main.py
+++ b/addons/hw_scale/controllers/main.py
@@ -95,7 +95,7 @@ ADAMEquipmentProtocol = ScaleProtocol(
     parity=serial.PARITY_NONE,
     timeout=0.2,
     writeTimeout=0.2,
-    weightRegexp=r"\s*([0-9.]+)kg", # LABEL format 3 + KG in the scale settings, but Label 1/2 should work
+    weightRegexp=b"\s*([0-9.]+)kg", # LABEL format 3 + KG in the scale settings, but Label 1/2 should work
     statusRegexp=None,
     statusParse=None,
     commandTerminator=b"\r\n",
diff --git a/addons/l10n_jp/data/account.account.template.csv b/addons/l10n_jp/data/account.account.template.csv
index ec2f2984771..f7046bf9915 100644
--- a/addons/l10n_jp/data/account.account.template.csv
+++ b/addons/l10n_jp/data/account.account.template.csv
@@ -9,7 +9,7 @@ A11219,A11219,出庫請求仮,account.data_account_type_current_assets,,FALSE,,l
 A11301,A11301,未収収益,account.data_account_type_current_assets,,FALSE,,l10n_jp1
 A11401,A11401,有価証券,account.data_account_type_current_assets,,FALSE,,l10n_jp1
 A11501,A11501,商品,account.data_account_type_current_assets,,FALSE,,l10n_jp1
-A11503,A11503,製品,account.data_account_type_current_assets,,FALSE,,l10n_jp1
+A11502,A11502,製品,account.data_account_type_current_assets,,FALSE,,l10n_jp1
 A11504,A11504,仕掛品,account.data_account_type_current_assets,,FALSE,,l10n_jp1
 A11505,A11505,原材料,account.data_account_type_current_assets,,FALSE,,l10n_jp1
 A11506,A11506,資材,account.data_account_type_current_assets,,FALSE,,l10n_jp1
diff --git a/addons/l10n_lu/data/account.tax.template-2015.csv b/addons/l10n_lu/data/account.tax.template-2015.csv
index 9f55b6048ef..1326ccdec34 100644
--- a/addons/l10n_lu/data/account.tax.template-2015.csv
+++ b/addons/l10n_lu/data/account.tax.template-2015.csv
@@ -405,4 +405,4 @@ lu_2011_tax_VP-PA-3,Sales Services 3% - Country,VP-PA-3,sale,percent,3,lu_2011_a
 lu_2011_tax_VP-PA-6,Sales Services 6% - Country,VP-PA-6,sale,percent,6,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,504,,"tag_lu_200,tag_lu_278",tax_group_6
 lu_2015_tax_VP-PA-8,Sales Services 8% - Country,VP-PA-8,sale,percent,8,lu_2011_account_4614111,lu_2011_account_4614111,lu_2011_chart_1,505,,"tag_lu_294,tag_lu_218",tax_group_8
 lu_2015_tax_SANS,Without Taxes,SANS,purchase,percent,0,,,lu_2011_chart_1,506,,tag_lu_598,tax_group_0
-lu_2015_tax_SANS,Without Taxes,SANS,sale,percent,0,,,lu_2011_chart_1,507,,tag_lu_598,tax_group_0
+lu_2015_tax_SANS_sale,Without Taxes,SANS,sale,percent,0,,,lu_2011_chart_1,507,,tag_lu_598,tax_group_0
diff --git a/addons/stock_account/models/stock.py b/addons/stock_account/models/stock.py
index 00fd9b257bd..5ccf689f08e 100644
--- a/addons/stock_account/models/stock.py
+++ b/addons/stock_account/models/stock.py
@@ -507,9 +507,9 @@ class StockMove(models.Model):
         if not accounts_data.get('stock_journal', False):
             raise UserError(_('You don\'t have any stock journal defined on your product category, check if you have installed a chart of accounts'))
         if not acc_src:
-            raise UserError(_('Cannot find a stock input account for the product %s. You must define one on the product category, or on the location, before processing this operation.') % (self.product_id.name))
+            raise UserError(_('Cannot find a stock input account for the product %s. You must define one on the product category, or on the location, before processing this operation.') % (self.product_id.display_name))
         if not acc_dest:
-            raise UserError(_('Cannot find a stock output account for the product %s. You must define one on the product category, or on the location, before processing this operation.') % (self.product_id.name))
+            raise UserError(_('Cannot find a stock output account for the product %s. You must define one on the product category, or on the location, before processing this operation.') % (self.product_id.display_name))
         if not acc_valuation:
             raise UserError(_('You don\'t have any stock valuation account defined on your product category. You must define one before processing this operation.'))
         journal_id = accounts_data['stock_journal'].id
@@ -533,7 +533,7 @@ class StockMove(models.Model):
 
         # check that all data is correct
         if self.company_id.currency_id.is_zero(debit_value):
-            raise UserError(_("The cost of %s is currently equal to 0. Change the cost or the configuration of your product to avoid an incorrect valuation.") % (self.product_id.name,))
+            raise UserError(_("The cost of %s is currently equal to 0. Change the cost or the configuration of your product to avoid an incorrect valuation.") % (self.product_id.display_name,))
         credit_value = debit_value