diff --git a/addons/account/models/account_journal_dashboard.py b/addons/account/models/account_journal_dashboard.py
index be36ec54201..935de537028 100644
--- a/addons/account/models/account_journal_dashboard.py
+++ b/addons/account/models/account_journal_dashboard.py
@@ -265,11 +265,11 @@ class account_journal(models.Model):
             return {
                 'type': 'ir.actions.client',
                 'tag': 'bank_statement_reconciliation_view',
-                'context': {'statement_ids': bank_stmt.ids},
+                'context': {'statement_ids': bank_stmt.ids, 'company_ids': self.mapped('company_id').ids},
             }
         else:
             # Open reconciliation view for customers/suppliers
-            action_context = {'show_mode_selector': False}
+            action_context = {'show_mode_selector': False, 'company_ids': self.mapped('company_id').ids}
             if self.type == 'sale':
                 action_context.update({'mode': 'customers'})
             elif self.type == 'purchase':
diff --git a/addons/account/static/src/js/account_reconciliation_widgets.js b/addons/account/static/src/js/account_reconciliation_widgets.js
index ea008e4c26e..55c597b0b21 100644
--- a/addons/account/static/src/js/account_reconciliation_widgets.js
+++ b/addons/account/static/src/js/account_reconciliation_widgets.js
@@ -91,6 +91,10 @@ var abstractReconciliation = Widget.extend(ControlPanelMixin, {
         // NB : for presets to work correctly, a field id must be the same string as a preset field
         this.presets = {};
         // Description of the fields to initialize in the "create new line" form
+        var domain_account_id = [['deprecated', '=', false]];
+        if (context && context.context && context.context.company_ids) {
+            domain_account_id.push(['company_id', 'in', context.context.company_ids]);
+        }
         this.create_form_fields = {
             account_id: {
                 id: "account_id",
@@ -103,7 +107,7 @@ var abstractReconciliation = Widget.extend(ControlPanelMixin, {
                     relation: "account.account",
                     string: _t("Account"),
                     type: "many2one",
-                    domain: [['deprecated', '=', false]],
+                    domain: domain_account_id,
                 },
             },
             label: {
diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index 2ae187ea4ff..748bc7b2e40 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -1384,6 +1384,9 @@ exports.Orderline = Backbone.Model.extend({
             if (!no_map_tax){
                 tax = self._map_tax_fiscal_position(tax);
             }
+            if (!tax){
+                return;
+            }
             if (tax.amount_type === 'group'){
                 var ret = self.compute_all(tax.children_tax_ids, price_unit, quantity, currency_rounding);
                 total_excluded = ret.total_excluded;
diff --git a/addons/web_kanban/static/src/js/kanban_column.js b/addons/web_kanban/static/src/js/kanban_column.js
index f848c266944..b4fa2e8d010 100644
--- a/addons/web_kanban/static/src/js/kanban_column.js
+++ b/addons/web_kanban/static/src/js/kanban_column.js
@@ -65,9 +65,10 @@ var KanbanColumn = Widget.extend({
         });
 
         var self = this;
-        if (group_data.options && group_data.options.group_by_tooltip) {
-            this.tooltip_info = _.map(group_data.options.group_by_tooltip, function (key, value, list) {
-                return (self.values && self.values[value] && "<div>" +key + "<br>" + self.values[value] + "</div>") || '';
+        if (group_data.options && group_data.options.group_by_tooltip && this.values) {
+            this.tooltip_info = _.map(group_data.options.group_by_tooltip, function (key, value) {
+                if (!self.values[value]) { return ''; }
+                return $('<div>').text(key + '<br>' + self.values[value]).text();
             }).join('');
         } else {
             this.tooltip_info = "";
diff --git a/doc/cla/individual/vuongtien2411.md b/doc/cla/individual/vuongtien2411.md
new file mode 100644
index 00000000000..821a9881a43
--- /dev/null
+++ b/doc/cla/individual/vuongtien2411.md
@@ -0,0 +1,11 @@
+Vietnam, 2017-08-24
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Do Vuong Tien  tiendv@trobz.com https://github.com/vuongtien2411