summaryrefslogtreecommitdiff
path: root/addons/barcodes/static/src/js/barcode_parser.js
diff options
context:
space:
mode:
authorVincent Schippefilt <vsc@odoo.com>2019-03-06 14:01:56 +0100
committerAaron Bohy <aab@odoo.com>2019-03-06 20:07:17 +0100
commit0ab6a629978f2ce07cf9f03696a941a85da3f684 (patch)
tree26f65ebf4f24776aa99c0afa7556a61e2abf6191 /addons/barcodes/static/src/js/barcode_parser.js
parentd5a1ff3f64ec3a5f446f5ae5283526e32c3fc413 (diff)
[REF] barcodes: adapt code after jQuery update
Part of task 1896658 Co-authored-by: Aaron Bohy <aab@odoo.com> Co-authored-by: Christophe Matthieu <chm@odoo.com> Co-authored-by: Mathieu Duckerts-Antoine <dam@odoo.com> Co-authored-by: David Monjoie <dmo@odoo.com> Co-authored-by: Martin Geubelle <mge@odoo.com> Co-authored-by: svs-odoo <svs@odoo.com> Co-authored-by: Vincent Schippefilt <vsc@odoo.com>
Diffstat (limited to 'addons/barcodes/static/src/js/barcode_parser.js')
-rw-r--r--addons/barcodes/static/src/js/barcode_parser.js12
1 files changed, 6 insertions, 6 deletions
diff --git a/addons/barcodes/static/src/js/barcode_parser.js b/addons/barcodes/static/src/js/barcode_parser.js
index cf357a438b2..3077f650fae 100644
--- a/addons/barcodes/static/src/js/barcode_parser.js
+++ b/addons/barcodes/static/src/js/barcode_parser.js
@@ -22,7 +22,7 @@ var BarcodeParser = Class.extend({
return;
}
var id = this.nomenclature_id[0];
- rpc.query({
+ return rpc.query({
model: 'barcode.nomenclature',
method: 'read',
args: [[id], ['name','rule_ids','upc_ean_conv']],
@@ -80,7 +80,7 @@ var BarcodeParser = Class.extend({
var total = sum1 + 3 * sum2;
return Number((10 - total % 10) % 10);
},
-
+
// returns true if the ean is a valid EAN barcode number by checking the control digit.
// ean must be a string
@@ -185,10 +185,10 @@ var BarcodeParser = Class.extend({
return match;
},
-
+
// attempts to interpret a barcode (string encoding a barcode Code-128)
// it will return an object containing various information about the barcode.
- // most importantly :
+ // most importantly :
// - code : the barcode
// - type : the type of the barcode (e.g. alias, unit product, weighted product...)
//
@@ -198,7 +198,7 @@ var BarcodeParser = Class.extend({
parse_barcode: function(barcode){
var parsed_result = {
encoding: '',
- type:'error',
+ type:'error',
code:barcode,
base_code: barcode,
value: 0,
@@ -213,7 +213,7 @@ var BarcodeParser = Class.extend({
var rule = rules[i];
var cur_barcode = barcode;
- if ( rule.encoding === 'ean13' &&
+ if ( rule.encoding === 'ean13' &&
this.check_encoding(barcode,'upca') &&
this.nomenclature.upc_ean_conv in {'upc2ean':'','always':''} ){
cur_barcode = '0' + cur_barcode;