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

[MERGE] forward port branch 9.0 up to ce038f5d15

Browse Source
This commit is contained in:
Christophe Simonis
2017-12-05 13:52:02 +01:00
parent 04bfd54013 ce038f5d15
commit dd7ee15fb8
2 changed files with 2 additions and 2 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 [];