From 75b6e241ce8a80fec933708438de646394e71fee Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 15 Nov 2021 14:06:50 +0100 Subject: [PATCH] Clean code --- htdocs/core/lib/fourn.lib.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/htdocs/core/lib/fourn.lib.php b/htdocs/core/lib/fourn.lib.php index 25bbd52e413..683b4b49912 100644 --- a/htdocs/core/lib/fourn.lib.php +++ b/htdocs/core/lib/fourn.lib.php @@ -132,7 +132,7 @@ function facturefourn_prepare_head($object) * @param Object $object Object related to tabs * @return array Array of tabs to show */ -function ordersupplier_prepare_head($object) +function ordersupplier_prepare_head(CommandeFournisseur $object) { global $db, $langs, $conf, $user; @@ -161,21 +161,24 @@ function ordersupplier_prepare_head($object) $head[$h][1] = $langs->trans("OrderDispatch"); //If dispach process running we add the number of item to dispatch into the head - if ($object->statut == '3' OR $object->statut == '4' OR $object->statut == '5') { - $object->fetch_lines(); + if (in_array($object->statut, array($object::STATUS_ORDERSENT, $object::STATUS_RECEIVED_PARTIALLY, $object::STATUS_RECEIVED_COMPLETELY))) { + $sumQtyAllreadyDispatched = 0; + $sumQtyOrdered = 0; + + if (empty($object->lines)) { + $object->fetch_lines(); + } $nbLinesOrdered = count($object->lines); $dispachedLines = $object->getDispachedLines(1); $nbDispachedLines = count($dispachedLines); - $sumQtyAllreadyDispatched = 0; for ($line = 0 ; $line < $nbDispachedLines; $line++) { $sumQtyAllreadyDispatched = $sumQtyAllreadyDispatched + $dispachedLines[$line]['qty']; } - $sumQtyOrdered = 0; for ($line = 0 ; $line < $nbLinesOrdered; $line++) { $sumQtyOrdered = $sumQtyOrdered + $object->lines[$line]->qty; } - $head[$h][1] .= ''.$sumQtyAllreadyDispatched.' / '.$sumQtyOrdered.''; + $head[$h][1] .= ''.price2num($sumQtyAllreadyDispatched, 'MS').' / '.price2num($sumQtyOrdered, 'MS').''; } $head[$h][2] = 'dispatch';