Author: bleny Date: 2013-08-30 18:24:14 +0200 (Fri, 30 Aug 2013) New Revision: 396 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: fixes #3113 'location' field in action was renamed 'receptionLocation' Modified: trunk/magalie-web/src/main/webapp/js/receive-article-input.js Modified: trunk/magalie-web/src/main/webapp/js/receive-article-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/receive-article-input.js 2013-08-29 12:47:46 UTC (rev 395) +++ trunk/magalie-web/src/main/webapp/js/receive-article-input.js 2013-08-30 16:24:14 UTC (rev 396) @@ -61,13 +61,14 @@ }, async: false, success: function(data) { - location = data.location; - locations.push(location); + location = data.receptionLocation; // null si le code barre n'est pas valide } }); } if (location == null) { throw new ValidationError(barcode + " n'est pas le code barre d'un emplacement valide"); + } else { + locations.push(location); } if (location.fullLocation) { throw new ValidationError("Emplt " + barcode + " en erreur - choisir un autre");