From: Frederic van der Essen Date: Wed, 1 Oct 2014 13:35:43 +0000 (+0200) Subject: [FIX] pos_barcodes: do not crash the point of sale when there's no barcode nomenclature X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=01ccabf58b8e9fb39d67744c81d74d9c67b77991;p=odoo%2Fodoo.git [FIX] pos_barcodes: do not crash the point of sale when there's no barcode nomenclature --- diff --git a/addons/pos_barcodes/static/src/js/barcodes.js b/addons/pos_barcodes/static/src/js/barcodes.js index d3e0717..1a5d569 100644 --- a/addons/pos_barcodes/static/src/js/barcodes.js +++ b/addons/pos_barcodes/static/src/js/barcodes.js @@ -24,17 +24,19 @@ openerp.pos_barcodes = function(instance){ fields: ['name','priority','type','pattern'], domain: function(self){ return [['barcode_nomenclature_id','=',self.nomenclature ? self.nomenclature.id : 0]]; }, loaded: function(self,rules){ - rules = rules.sort(function(a,b){ return b.priority - a.priority; }); - self.nomenclature.rules = rules; - for (var i = 0; i < rules.length; i++) { - var pattern = rules[i].pattern; - pattern = pattern.replace(/[x\*]/gi,'x'); - - while (pattern.length < 12) { - pattern += 'x'; + if (self.nomenclature) { + rules = rules.sort(function(a,b){ return b.priority - a.priority; }); + self.nomenclature.rules = rules; + for (var i = 0; i < rules.length; i++) { + var pattern = rules[i].pattern; + pattern = pattern.replace(/[x\*]/gi,'x'); + + while (pattern.length < 12) { + pattern += 'x'; + } + + rules[i].pattern = pattern; } - - rules[i].pattern = pattern; } }, });