From: Vincent Vanwaelscappel Date: Thu, 8 Mar 2018 10:43:28 +0000 (+0100) Subject: #1966 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=9c17f72e3b9727239403bd03da9b74265e642ce9;p=fluidbook-html5.git #1966 --- diff --git a/js/libs/fluidbook/special/wescosales.js b/js/libs/fluidbook/special/wescosales.js index 2c6b7f9f..8b79810c 100644 --- a/js/libs/fluidbook/special/wescosales.js +++ b/js/libs/fluidbook/special/wescosales.js @@ -203,11 +203,18 @@ function getWescoRef(ref) { var ca = null; var hasCA = false; - if (line0[i + 1] != undefined && line0[i + 1].toString().indexOf('CA ' + line0[i]) != -1) { - ca = Math.round(parseFloat(line[i + 1])).toString(); + var colTitle = line0[i]; + var qte = line[i]; + if (colTitle.indexOf('Qté') == 0) { + colTitle = line0[i].substr(4); + } + + if (line0[i + 1] != undefined && line0[i].indexOf('Qté') == 0 && line0[i + 1].toString().indexOf('CA ' + colTitle) != -1) { + qte = parseInt(line[i]).toLocaleString(); + ca = Math.round(parseFloat(line[i + 1])).toLocaleString(); hasCA = true; } - d.push([line0[i], line[i], ca]); + d.push([colTitle, qte, ca]); if (String(line0[i]).toLocaleLowerCase().indexOf('supp') >= 0 && line[i] !== null && String(line[i]) != '') { res.del = line[i];