pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch 10.0 up to dd7ee15fb8

Browse Source
This commit is contained in:
Christophe Simonis
2017-12-05 14:21:11 +01:00
parent 2a86e9245c dd7ee15fb8
commit e9c2dcd28d
5 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/auth_oauth/data/auth_oauth_data.xml
+1 -1
View File
@@ -16,7 +16,7 @@
<field name="auth_endpoint">https://www.facebook.com/dialog/oauth</field> <field name="auth_endpoint">https://www.facebook.com/dialog/oauth</field>
<field name="scope">public_profile,email</field> <field name="scope">public_profile,email</field>
<field name="validation_endpoint">https://graph.facebook.com/me</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="css_class">fa fa-facebook-square</field>
<field name="body">Log in with facebook</field> <field name="body">Log in with facebook</field>
</record> </record>
addons/point_of_sale/static/src/js/db.js
+1 -1
View File
@@ -301,7 +301,7 @@ var PosDB = core.Class.extend({
search_partner: function(query){ search_partner: function(query){
try { try {
query = query.replace(/[\[\]\(\)\+\*\?\.\-\!\&\^\$\|\~\_\{\}\:\,\\\/]/g,'.'); query = query.replace(/[\[\]\(\)\+\*\?\.\-\!\&\^\$\|\~\_\{\}\:\,\\\/]/g,'.');
query = query.replace(' ','.+'); query = query.replace(/ /g,'.+');
var re = RegExp("([0-9]+):.*?"+query,"gi"); var re = RegExp("([0-9]+):.*?"+query,"gi");
}catch(e){ }catch(e){
return []; return [];
addons/sales_team/models/crm_team.py
+1 -1
View File
@@ -24,7 +24,7 @@ class CrmTeam(models.Model):
def _get_default_team_id(self, user_id=None): def _get_default_team_id(self, user_id=None):
if not user_id: if not user_id:
user_id = self.env.uid 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([ team_id = self.env['crm.team'].sudo().search([
'|', ('user_id', '=', user_id), ('member_ids', '=', user_id), '|', ('user_id', '=', user_id), ('member_ids', '=', user_id),
'|', ('company_id', '=', False), ('company_id', 'child_of', [company_id]) '|', ('company_id', '=', False), ('company_id', 'child_of', [company_id])
addons/web/static/src/js/views/search_view.js
+1 -1
View File
@@ -337,7 +337,7 @@ var SearchView = View.extend({
}, },
set_default_filters: function () { set_default_filters: function () {
var self = this, 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) { if (!self.options.disable_custom_filters && default_custom_filter) {
return this.favorite_menu.toggle_filter(default_custom_filter, true); return this.favorite_menu.toggle_filter(default_custom_filter, true);
} }
doc/cla/individual/ruter.md
+11
View File
@@ -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