--- /tmp/dsg/dolibarr/htdocs/product/stock/lib/github_19.0.3_replenishment.lib.php
+++ /tmp/dsg/dolibarr/htdocs/product/stock/lib/client_replenishment.lib.php
@@ -35 +35 @@
-	global $db, $conf;

+	global $db;

@@ -41,2 +41,2 @@
-	$sql = 'SELECT fk_product, SUM(qty) as qtydispatched FROM '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch';

-	$sql .= ' WHERE fk_commande = '.((int) $order_id);

+	$sql = 'SELECT fk_product, SUM(qty) FROM '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch';

+	$sql .= ' WHERE fk_commande = '.$order_id;

@@ -46,4 +46,4 @@
-	if ($resql && $db->num_rows($resql)) {

-		while ($obj = $db->fetch_object($resql)) {

-			$dispatched[$obj->fk_product] = $obj->qtydispatched;

-		}

+	if ($resql && $db->num_rows($resql))

+	{

+		while ($obj = $db->fetch_object($resql))

+			$dispatched[$obj->fk_product] = $obj;

@@ -53,2 +53,2 @@
-	$sql = 'SELECT fk_product, SUM(qty) as qtyordered FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet';

-	$sql .= ' WHERE fk_commande = '.((int) $order_id);

+	$sql = 'SELECT fk_product, SUM(qty) FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet';

+	$sql .= ' WHERE fk_commande = '.$order_id;

@@ -56,3 +56 @@
-	if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {

-		$sql .= ' AND product_type = 0';

-	}

+	if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) $sql .= ' AND product_type = 0';

@@ -62,4 +60,4 @@
-	if ($resql && $db->num_rows($resql)) {

-		while ($obj = $db->fetch_object($resql)) {

-			$ordered[$obj->fk_product] = $obj->qtyordered;

-		}

+	if ($resql && $db->num_rows($resql))

+	{

+		while ($obj = $db->fetch_object($resql))

+			$ordered[$obj->fk_product] = $obj;

@@ -69,4 +67,3 @@
-	foreach ($ordered as $key => $val) {

-		if ((empty($ordered[$key]) ? 0 : $ordered[$key]) > (empty($dispatched[$key]) ? 0 : $dispatched[$key])) {

-			$todispatch++;

-		}

+	foreach ($ordered as $key => $val)

+	{

+		if ($ordered[$key] > $dispatched[$key]) $todispatch++;

@@ -91,3 +88,6 @@
-	if ($resql && $db->num_rows($resql) > 0) {

-		while ($obj = $db->fetch_object($resql)) {

-			if (!dolDispatchToDo($obj->rowid)) {

+	if ($resql && $db->num_rows($resql) > 0)

+	{

+		while ($obj = $db->fetch_object($resql))

+		{

+			if (!dolDispatchToDo($obj->rowid))

+			{

@@ -99 +99,2 @@
-	if (count($resarray)) {

+	if (count($resarray))

+	{

@@ -116 +117 @@
-	global $db, $conf;

+	global $db, $langs, $conf;

@@ -129 +130 @@
-	$sql .= ' AND cfd.fk_product = '.((int) $product_id);

+	$sql .= ' AND cfd.fk_product = '.$product_id;

@@ -133 +134,2 @@
-	if ($resql) {

+	if ($resql)

+	{

@@ -135 +137,2 @@
-		if ($exists) {

+		if ($exists)

+		{

@@ -141 +144,4 @@
-	} else {

+	}

+	else

+	{

+		$error = $db->lasterror();

@@ -144 +150 @@
-		return 'Error '.$db->lasterror();

+		return $langs->trans('error');

@@ -157 +162,0 @@
-