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

[FIX] point_of_sale: the search in product or partners could crash if there were a number followed by a colon

Browse Source
This commit is contained in:
Frédéric van der Essen
2014-12-11 15:42:51 +01:00
parent a6212d2d20
commit bb913d0a8f
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/point_of_sale/static/src/js/db.js
+9 -7
View File
@@ -129,24 +129,25 @@ function openerp_pos_db(instance, module){
this.cache[store] = data; this.cache[store] = data;
}, },
_product_search_string: function(product){ _product_search_string: function(product){
var str = '' + product.id + ':' + product.display_name; var str = product.display_name;
if (product.ean13) { if (product.ean13) {
str += '|' + product.ean13; str += '|' + product.ean13;
} }
if (product.default_code) { if (product.default_code) {
str += '|' + product.default_code.replace(':',''); str += '|' + product.default_code;
} }
if (product.description) { if (product.description) {
str += '|' + product.description.replace(':',''); str += '|' + product.description;
} }
if (product.description_sale) { if (product.description_sale) {
str += '|' + product.description_sale.replace(':',''); str += '|' + product.description_sale;
} }
var packagings = this.packagings_by_product_tmpl_id[product.product_tmpl_id] || []; var packagings = this.packagings_by_product_tmpl_id[product.product_tmpl_id] || [];
for (var i = 0; i < packagings.length; i++) { for (var i = 0; i < packagings.length; i++) {
str += '|' + packagings[i].ean; str += '|' + packagings[i].ean;
} }
return str + '\n'; str = product.id + ':' + str.replace(':','') + '\n';
return str;
}, },
add_products: function(products){ add_products: function(products){
var stored_categories = this.product_by_category_id; var stored_categories = this.product_by_category_id;
@@ -206,7 +207,7 @@ function openerp_pos_db(instance, module){
} }
}, },
_partner_search_string: function(partner){ _partner_search_string: function(partner){
var str = '' + partner.id + ':' + partner.name; var str = partner.name;
if(partner.ean13){ if(partner.ean13){
str += '|' + partner.ean13; str += '|' + partner.ean13;
} }
@@ -222,7 +223,8 @@ function openerp_pos_db(instance, module){
if(partner.email){ if(partner.email){
str += '|' + partner.email; str += '|' + partner.email;
} }
return str + '\n'; str = '' + partner.id + ':' + str.replace(':','') + '\n';
return str;
}, },
add_partners: function(partners){ add_partners: function(partners){
var updated_count = 0; var updated_count = 0;