diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index cbe602f7313..a0280ce9e39 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -1013,7 +1013,7 @@ if ($action == 'create') { $img=img_warning($langs->trans("StockTooLow")); } - print "      -> + print "      -> ".$value['fullpath']." (".$value['nb'].") ".$value['nb_total']."   ".$value['stock']." ".$img.""; diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php index c3e277ad7b0..039a038f18a 100644 --- a/htdocs/expedition/index.php +++ b/htdocs/expedition/index.php @@ -90,17 +90,15 @@ if ($resql) print ''; print ''.$langs->trans("SendingsToValidate").''; $i = 0; - $var = True; while ($i < $num) { $obj = $db->fetch_object($resql); $shipment->id=$obj->rowid; $shipment->ref=$obj->ref; - $shipment->ref_customer=$obj->ref_customer; - + $shipment->ref_customer=$obj->ref_customer; - print "'; + print ''; print $shipment->getNomUrl(1); print ""; print ''; @@ -142,7 +140,6 @@ if ($resql) print ''; print ''; print ''; - $var = True; while ($i < $num) { $obj = $db->fetch_object($resql); @@ -154,8 +151,7 @@ if ($resql) $orderstatic->facturee=0; $companystatic->name=$obj->name; - $companystatic->id=$obj->socid; - + $companystatic->id=$obj->socid; print ''; print '
'.$langs->trans("OrdersToProcess").'
'; @@ -204,7 +200,6 @@ if ( $resql ) print ''; print ''; print ''; - $var = True; while ($i < $num) { $obj = $db->fetch_object($resql); @@ -216,10 +211,9 @@ if ( $resql ) $orderstatic->facturee=$obj->billed; $companystatic->name=$obj->name; - $companystatic->id=$obj->socid; - + $companystatic->id=$obj->socid; - print "'; print '
'.$langs->trans("OrdersInProcess").'
"; + print '
'; print $orderstatic->getNomUrl(1); print ''; @@ -264,16 +258,14 @@ if ($resql) $i = 0; print ''; print ''; - print ''; - $var = True; + print ''; while ($i < $num) { $obj = $db->fetch_object($resql); $shipment->id=$obj->rowid; $shipment->ref=$obj->ref; - $shipment->ref_customer=$obj->ref_customer; - + $shipment->ref_customer=$obj->ref_customer; print '';*/ print ''; $oldyear=0; -$var=true; foreach ($data as $val) { $year = $val['year']; @@ -278,7 +277,7 @@ foreach ($data as $val) $oldyear--; - print ''; + print ''; print ''; print ''; @@ -286,9 +285,8 @@ foreach ($data as $val) print '';*/ print ''; } - - print ''; + print ''; print '
'.$langs->trans("LastSendings",$num).'
'.$langs->trans("LastSendings", $num).'
'; print $shipment->getNomUrl(1); diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php index cccfc0d90a0..53837c76fd1 100644 --- a/htdocs/expedition/stats/index.php +++ b/htdocs/expedition/stats/index.php @@ -269,7 +269,6 @@ print ''.$langs->trans("AmountAverage").'
'.$oldyear.'00
'; if ($year) print ''.$year.''; else print $langs->trans("ValidationDateNotDefinedEvenIfShipmentValidated");