[MERGE] forward port branch 10.0 up to dd7ee15fb8
This commit is contained in:
@@ -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>
|
||||
|
||||
@@ -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 [];
|
||||
|
||||
@@ -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])
|
||||
|
||||
@@ -337,7 +337,7 @@ var SearchView = View.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);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
China, 2017-12-05
|
||||
|
||||
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,
|
||||
|
||||
Ruter ruter.lv@gmail.com https://github.com/ruter
|
||||
Reference in New Issue
Block a user