diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang index 5f6b45cff1e..368128e8f02 100644 --- a/htdocs/langs/en_US/stocks.lang +++ b/htdocs/langs/en_US/stocks.lang @@ -95,3 +95,4 @@ ReplenishmentOrders=Replenishment orders UseVirtualStock=Use virtual stock instead of physical stock RuleForStockReplenishment=Rule for stocks replenishment SelectProduct=Select at least one product +AlertOnly= Alerts only diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang index 98aca2b2803..d0084e82fef 100644 --- a/htdocs/langs/fr_FR/stocks.lang +++ b/htdocs/langs/fr_FR/stocks.lang @@ -95,3 +95,4 @@ ReplenishmentOrders=Commandes de réapprovisionnement UseVirtualStock=Utiliser le stock théorique à la place du stock physique RuleForStockReplenishment=Règle de gestion du réapprovisionnement des stocks SelectProduct=Sélectionnez au moins un produit +AlertOnly = Alertes seulement diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php index 5e4835ec4ff..fa7663e1932 100644 --- a/htdocs/product/stock/replenish.php +++ b/htdocs/product/stock/replenish.php @@ -47,6 +47,7 @@ $snom = GETPOST('snom', 'alpha'); $sall = GETPOST('sall', 'alpha'); $type = GETPOST('type','int'); $tobuy = GETPOST('tobuy', 'int'); +$salerte = GETPOST('salerte', 'alpha'); $sortfield = GETPOST('sortfield','alpha'); $sortorder = GETPOST('sortorder','alpha'); @@ -66,10 +67,11 @@ $offset = $limit * $page ; * Actions */ -if (isset($_POST['button_removefilter'])) { +if (isset($_POST['button_removefilter']) || isset($_POST['valid'])) { $sref = ''; $snom = ''; $sal = ''; + $salerte = ''; } //orders creation @@ -206,6 +208,9 @@ $sql .= ', p.duration, p.tobuy, p.seuil_stock_alerte'; $sql .= ', p.desiredstock'; $sql .= ' HAVING (p.desiredstock > SUM(s.reel) or SUM(s.reel) is NULL)'; $sql .= ' AND p.desiredstock > 0'; +if ($salerte == 'on') { + $sql .= ' AND SUM(s.reel) < p.seuil_stock_alerte AND p.seuil_stock_alerte is not NULL'; +} $sql .= $db->order($sortfield,$sortorder); $sql .= $db->plimit($limit + 1, $offset); $resql = $db->query($sql); @@ -365,7 +370,7 @@ if ($resql) { ''; } echo '