From 5aa2d3cbac6866aa7d69cddfc2ef3f645cfa4e70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Delobelle?= Date: Sat, 13 Jan 2018 02:04:42 +0100 Subject: [PATCH] =?UTF-8?q?kfet.kpsul=20--=20Make=20the=20low-stock=20indi?= =?UTF-8?q?cator=20appear=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …if ordered quantity is greater than the current stock. Also fix the focus after a reset of the selected account. --- kfet/static/kfet/js/kfet.api.js | 2 +- kfet/templates/kfet/kpsul.html | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/kfet/static/kfet/js/kfet.api.js b/kfet/static/kfet/js/kfet.api.js index 0d1652df..ba26bb33 100644 --- a/kfet/static/kfet/js/kfet.api.js +++ b/kfet/static/kfet/js/kfet.api.js @@ -2070,7 +2070,7 @@ class PurchaseBasketFormatter extends ItemBasketFormatter { static attr_low_stock(o) { let stock = o.article.stock; - return -5 <= stock && stock <= 5; + return (-5 <= stock) && (stock <= 5 || stock < o.article_nb); } } diff --git a/kfet/templates/kfet/kpsul.html b/kfet/templates/kfet/kpsul.html index 0c7afa9c..289736d2 100644 --- a/kfet/templates/kfet/kpsul.html +++ b/kfet/templates/kfet/kpsul.html @@ -399,9 +399,8 @@ $(document).ready(function() { case 113: if (e.shiftKey) { // Shift+F2 - Account reset - kpsul.account_manager - .reset() - .focus(); + kpsul.account_manager.reset(); + kpsul.account_manager.focus(); } else { // F2 - Basket reset kpsul.basket.reset();