lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX Bug: Delivery order and date are not displayed #4372

Browse Source
This commit is contained in:
Laurent Destailleur 2016-01-13 20:56:20 +01:00
parent 55a056a449
commit a8148b8b40
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/expedition/list.php
View File

@ -102,7 +102,7 @@ if ($socid)
{ {
$sql.= " AND e.fk_soc = ".$socid; $sql.= " AND e.fk_soc = ".$socid;
} }
if ($viewstatut <> '') { if ($viewstatut <> '' && $viewstatut >= 0) {
$sql.= " AND e.fk_statut = ".$viewstatut; $sql.= " AND e.fk_statut = ".$viewstatut;
} }
if ($search_ref_exp) $sql .= natural_search('e.ref', $search_ref_exp); if ($search_ref_exp) $sql .= natural_search('e.ref', $search_ref_exp);
@ -113,6 +113,7 @@ if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
$sql.= $db->order($sortfield,$sortorder); $sql.= $db->order($sortfield,$sortorder);
$sql.= $db->plimit($limit + 1,$offset); $sql.= $db->plimit($limit + 1,$offset);
//print $sql;
$resql=$db->query($sql); $resql=$db->query($sql);
if ($resql) if ($resql)
{ {
@ -225,7 +226,8 @@ if ($resql)
if ($conf->livraison_bon->enabled) if ($conf->livraison_bon->enabled)
{ {
$shipment->fetchObjectLinked($shipment->id,$shipment->element); $shipment->fetchObjectLinked($shipment->id,$shipment->element);
$receiving=(! empty($shipment->linkedObjects['delivery'][0])?$shipment->linkedObjects['delivery'][0]:''); $receiving='';
if (count($shipment->linkedObjects['delivery']) > 0) $receiving=reset($shipment->linkedObjects['delivery']);
// Ref // Ref
print '<td>'; print '<td>';