[MERGE] forward port branch saas-15 up to 970be94f376

5 files changed, 5 insertions, 5 deletions

diff --git a/addons/auth_oauth/data/auth_oauth_data.xml b/addons/auth_oauth/data/auth_oauth_data.xml
index 1b1ff532ae4..8417c9c4b2d 100644
--- a/addons/auth_oauth/data/auth_oauth_data.xml
+++ b/addons/auth_oauth/data/auth_oauth_data.xml
@@ -16,7 +16,7 @@
             <field name="auth_endpoint">https://www.facebook.com/dialog/oauth</field>
             <field name="scope">public_profile,email</field>
             <field name="validation_endpoint">https://graph.facebook.com/me</field>
-            <field name="data_endpoint"></field>
+            <field name="data_endpoint">https://graph.facebook.com/me?fields=id,name,email</field>
             <field name="css_class">fa fa-facebook-square</field>
             <field name="body">Log in with facebook</field>
         </record>
diff --git a/addons/base_sparse_field/models/fields.py b/addons/base_sparse_field/models/fields.py
index cb1e1981193..e2b8adc0e29 100644
--- a/addons/base_sparse_field/models/fields.py
+++ b/addons/base_sparse_field/models/fields.py
@@ -81,7 +81,7 @@ class Serialized(fields.Field):
     }
     column_type = ('text', 'text')
 
-    def convert_to_column(self, value, record):
+    def convert_to_column(self, value, record, values=None):
         return json.dumps(value)
 
     def convert_to_cache(self, value, record, validate=True):
diff --git a/addons/point_of_sale/static/src/js/db.js b/addons/point_of_sale/static/src/js/db.js
index b70b3517bf2..f777dc27324 100644
--- a/addons/point_of_sale/static/src/js/db.js
+++ b/addons/point_of_sale/static/src/js/db.js
@@ -301,7 +301,7 @@ var PosDB = core.Class.extend({
     search_partner: function(query){
         try {
             query = query.replace(/[\[\]\(\)\+\*\?\.\-\!\&\^\$\|\~\_\{\}\:\,\\\/]/g,'.');
-            query = query.replace(' ','.+');
+            query = query.replace(/ /g,'.+');
             var re = RegExp("([0-9]+):.*?"+query,"gi");
         }catch(e){
             return [];
diff --git a/addons/sales_team/models/crm_team.py b/addons/sales_team/models/crm_team.py
index 16f02a4d9d1..67cec58b761 100644
--- a/addons/sales_team/models/crm_team.py
+++ b/addons/sales_team/models/crm_team.py
@@ -24,7 +24,7 @@ class CrmTeam(models.Model):
     def _get_default_team_id(self, user_id=None):
         if not user_id:
             user_id = self.env.uid
-        company_id = self.sudo(user_id).company_id.id
+        company_id = self.sudo(user_id).env.user.company_id.id
         team_id = self.env['crm.team'].sudo().search([
             '|', ('user_id', '=', user_id), ('member_ids', '=', user_id),
             '|', ('company_id', '=', False), ('company_id', 'child_of', [company_id])
diff --git a/addons/web/static/src/js/chrome/search_view.js b/addons/web/static/src/js/chrome/search_view.js
index 6c3adcafcca..58b18f05deb 100644
--- a/addons/web/static/src/js/chrome/search_view.js
+++ b/addons/web/static/src/js/chrome/search_view.js
@@ -339,7 +339,7 @@ var SearchView = Widget.extend({
     },
     set_default_filters: function () {
         var self = this,
-            default_custom_filter = this.$buttons && this.favorite_menu.get_default_filter();
+            default_custom_filter = this.$buttons && this.favorite_menu && this.favorite_menu.get_default_filter();
         if (!self.options.disable_custom_filters && default_custom_filter) {
             return this.favorite_menu.toggle_filter(default_custom_filter, true);
         }