From 6717d53b1185b8dd59edded6d8091f0fc5b7b020 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 15 Oct 2023 21:51:10 +0200 Subject: [PATCH] FIX dolDispatchToDo return was always false since several years --- htdocs/product/stock/lib/replenishment.lib.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/htdocs/product/stock/lib/replenishment.lib.php b/htdocs/product/stock/lib/replenishment.lib.php index a7354c1d001..152c74b1633 100644 --- a/htdocs/product/stock/lib/replenishment.lib.php +++ b/htdocs/product/stock/lib/replenishment.lib.php @@ -32,25 +32,25 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; */ function dolDispatchToDo($order_id) { - global $db; + global $db, $conf; $dispatched = array(); $ordered = array(); // Count nb of quantity dispatched per product - $sql = 'SELECT fk_product, SUM(qty) FROM '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch'; + $sql = 'SELECT fk_product, SUM(qty) as qtydispatched FROM '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch'; $sql .= ' WHERE fk_commande = '.((int) $order_id); $sql .= ' GROUP BY fk_product'; $sql .= ' ORDER by fk_product'; $resql = $db->query($sql); if ($resql && $db->num_rows($resql)) { while ($obj = $db->fetch_object($resql)) { - $dispatched[$obj->fk_product] = $obj; + $dispatched[$obj->fk_product] = $obj->qtydispatched; } } // Count nb of quantity to dispatch per product - $sql = 'SELECT fk_product, SUM(qty) FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet'; + $sql = 'SELECT fk_product, SUM(qty) as qtyordered FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet'; $sql .= ' WHERE fk_commande = '.((int) $order_id); $sql .= ' AND fk_product > 0'; if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) { @@ -61,13 +61,13 @@ function dolDispatchToDo($order_id) $resql = $db->query($sql); if ($resql && $db->num_rows($resql)) { while ($obj = $db->fetch_object($resql)) { - $ordered[$obj->fk_product] = $obj; + $ordered[$obj->fk_product] = $obj->qtyordered; } } $todispatch = 0; foreach ($ordered as $key => $val) { - if ($ordered[$key] > $dispatched[$key]) { + if ((empty($ordered[$key]) ? 0 : $ordered[$key]) > (empty($dispatched[$key]) ? 0 : $dispatched[$key])) { $todispatch++; } } @@ -113,7 +113,7 @@ function dispatchedOrders() */ function ordered($product_id) { - global $db, $langs, $conf; + global $db, $conf; $sql = 'SELECT DISTINCT cfd.fk_product, SUM(cfd.qty) as qty FROM'; $sql .= ' '.MAIN_DB_PREFIX.'commande_fournisseurdet as cfd '; @@ -139,10 +139,9 @@ function ordered($product_id) return null; //img_picto('', 'stcomm-1'); } } else { - $error = $db->lasterror(); dol_print_error($db); - return $langs->trans('error'); + return 'Error '.$db->lasterror(); } } @@ -155,6 +154,7 @@ function ordered($product_id) function getProducts($order_id) { global $db; + $order = new CommandeFournisseur($db); $f = $order->fetch($order_id); $products = array();