Clean code
This commit is contained in:
parent
f2bfa8b2a1
commit
75b6e241ce
@ -132,7 +132,7 @@ function facturefourn_prepare_head($object)
|
|||||||
* @param Object $object Object related to tabs
|
* @param Object $object Object related to tabs
|
||||||
* @return array Array of tabs to show
|
* @return array Array of tabs to show
|
||||||
*/
|
*/
|
||||||
function ordersupplier_prepare_head($object)
|
function ordersupplier_prepare_head(CommandeFournisseur $object)
|
||||||
{
|
{
|
||||||
global $db, $langs, $conf, $user;
|
global $db, $langs, $conf, $user;
|
||||||
|
|
||||||
@ -161,21 +161,24 @@ function ordersupplier_prepare_head($object)
|
|||||||
$head[$h][1] = $langs->trans("OrderDispatch");
|
$head[$h][1] = $langs->trans("OrderDispatch");
|
||||||
|
|
||||||
//If dispach process running we add the number of item to dispatch into the head
|
//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') {
|
if (in_array($object->statut, array($object::STATUS_ORDERSENT, $object::STATUS_RECEIVED_PARTIALLY, $object::STATUS_RECEIVED_COMPLETELY))) {
|
||||||
$object->fetch_lines();
|
$sumQtyAllreadyDispatched = 0;
|
||||||
|
$sumQtyOrdered = 0;
|
||||||
|
|
||||||
|
if (empty($object->lines)) {
|
||||||
|
$object->fetch_lines();
|
||||||
|
}
|
||||||
$nbLinesOrdered = count($object->lines);
|
$nbLinesOrdered = count($object->lines);
|
||||||
$dispachedLines = $object->getDispachedLines(1);
|
$dispachedLines = $object->getDispachedLines(1);
|
||||||
$nbDispachedLines = count($dispachedLines);
|
$nbDispachedLines = count($dispachedLines);
|
||||||
|
|
||||||
$sumQtyAllreadyDispatched = 0;
|
|
||||||
for ($line = 0 ; $line < $nbDispachedLines; $line++) {
|
for ($line = 0 ; $line < $nbDispachedLines; $line++) {
|
||||||
$sumQtyAllreadyDispatched = $sumQtyAllreadyDispatched + $dispachedLines[$line]['qty'];
|
$sumQtyAllreadyDispatched = $sumQtyAllreadyDispatched + $dispachedLines[$line]['qty'];
|
||||||
}
|
}
|
||||||
$sumQtyOrdered = 0;
|
|
||||||
for ($line = 0 ; $line < $nbLinesOrdered; $line++) {
|
for ($line = 0 ; $line < $nbLinesOrdered; $line++) {
|
||||||
$sumQtyOrdered = $sumQtyOrdered + $object->lines[$line]->qty;
|
$sumQtyOrdered = $sumQtyOrdered + $object->lines[$line]->qty;
|
||||||
}
|
}
|
||||||
$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$sumQtyAllreadyDispatched.' / '.$sumQtyOrdered.'</span>';
|
$head[$h][1] .= '<span class="badge marginleftonlyshort">'.price2num($sumQtyAllreadyDispatched, 'MS').' / '.price2num($sumQtyOrdered, 'MS').'</span>';
|
||||||
}
|
}
|
||||||
|
|
||||||
$head[$h][2] = 'dispatch';
|
$head[$h][2] = 'dispatch';
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user