diff --git a/__manifest__.py b/__manifest__.py index 697660cb970d8f1ceaf28e338af69f423f58be0f..fe3ef56d5ea53cd126cb159303503c3a8f04697a 100644 --- a/__manifest__.py +++ b/__manifest__.py @@ -1,7 +1,7 @@ { "name": "VRACOOP - POS Balance Container QRCode", "summary": "VRACOOP - POS Balance Container QRCode", - "version": "12.0.1.5.6", + "version": "12.0.1.5.7", "development_status": "Beta", "author": "Le Filament", "maintainers": ["remi-filament"], diff --git a/static/src/js/barcode.js b/static/src/js/barcode.js index 0ab190b71f1011d9a72ab31a7a152416ce10e85c..d40697adbcbf182654fe1a09a6990c189a63c877 100644 --- a/static/src/js/barcode.js +++ b/static/src/js/barcode.js @@ -28,7 +28,6 @@ BarcodeParser.include({ // returns a valid zero padded ean13 from an ean prefix. the ean prefix must be a string. sanitize_ean19: function(ean){ ean = ean.substr(0,21); - ean = "164312590815001230233" return ean.substr(0,21) + this.ean_checksum_qr(ean); }, diff --git a/static/src/js/container.js b/static/src/js/container.js index 952b1c178680fd6b45b9ef0eb27f0e3bda06110e..4dc61ae4368a7e8234935723fa26c55f19a394c0 100644 --- a/static/src/js/container.js +++ b/static/src/js/container.js @@ -110,7 +110,8 @@ odoo.define('vracoop_pos_container_qrcode.container_print_qr', function (require var categ_container = this.pos.config.categ_container; var timestamp = Math.floor((new Date().getTime())/1000); - var weight_str = (this.weight * 1000).toString(); +// var weight_str = (this.weight * 1000).toString(); + var weight_str = parseInt(this.weight * 1000, 10); weight_str = ("0000" + weight_str).slice(-4); var prefixe_qr = ("00000" + this.pos.config.prefixe_qr).slice(-5); diff --git a/static/src/xml/pos.xml b/static/src/xml/pos.xml index 6e48d3b3cd9de076db7bc948e04a9ca8cf252a75..655600609476b19f76e9125c0410ac2f83c5b148 100644 --- a/static/src/xml/pos.xml +++ b/static/src/xml/pos.xml @@ -102,15 +102,6 @@ ^FO128,30^BQ,2,4,H,7^FDQA,<t t-esc='url_barcode'/>^FS ^FO165,175^A0,20^FD<t t-esc='weight_gr'/>^FS ^XZ -<!-- ^XA--> - -<!-- ^FO40,143^BQ,2,4,H,7^FDQA,<t t-esc='url_barcode'/>^FS--> - -<!-- ^XZ--> -<!-- ^XA--> -<!-- ^FO103,30^BQ,2,4,H,7^FDQA,<t t-esc='url_barcode'/>^FS--> -<!-- ^CF,15,10^FO135,170^FD<t t-esc='weight_gr'/>^FS--> -<!-- ^XZ--> </receipt> </t>