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

Some fixes

Browse Source
This commit is contained in:
Laurent Destailleur 2009-07-30 07:24:18 +00:00
parent 1d7af72c8e
commit 893ffa74c8
2 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
htdocs/expedition/fiche.php
View File

@ -621,25 +621,28 @@ else
print "</tr>";
// Linked documents
print '<tr><td>';
if ($origin == 'commande')
if ($typeobject == 'commande' && $expedition->$typeobject->id && $conf->commande->enabled)
{
print '<tr><td>';
$order=new Commande($db);
$order->fetch($expedition->$origin->id);
$order->fetch($expedition->$typeobject->id);
print $langs->trans("RefOrder").'</td>';
print '<td colspan="3">';
print $order->getNomUrl(1,'commande');
print "</td>\n";
print '</tr>';
}
if ($origin == 'propal')
if ($typeobject == 'propal' && $expedition->$typeobject->id && $conf->propal->enabled)
{
print '<tr><td>';
$propal=new Propal($db);
$propal->fetch($expedition->$origin->id);
$propal->fetch($expedition->$typeobject->id);
print $langs->trans("RefProposal").'</td>';
print '<td colspan="3">';
print $propal->getNomUrl(1,'expedition');
print "</td>\n";
print '</tr>';
}
print "</td>\n";
print '</tr>';
// Ref customer
print '<tr><td>'.$langs->trans("RefCustomer").'</td>';
@ -894,9 +897,12 @@ else
print '</td></tr></table>';
print '<br>';
//show_list_sending_receive($expedition->origin,$expedition->origin_id," AND e.rowid <> ".$expedition->id);
show_list_sending_receive($expedition->origin,$expedition->origin_id);
if ($expedition->$origin->id)
{
print '<br>';
//show_list_sending_receive($expedition->origin,$expedition->origin_id," AND e.rowid <> ".$expedition->id);
show_list_sending_receive($expedition->origin,$expedition->origin_id);
}
}
else

16
htdocs/livraison/fiche.php
View File

@ -370,6 +370,7 @@ else
$expedition=new Expedition($db);
$result = $expedition->fetch($livraison->expedition_id);
$typeobject = $expedition->origin;
if ($livraison->origin_id)
{
@ -434,7 +435,7 @@ else
print "</tr>";
// Document origine
if ($conf->commande->enabled)
if ($typeobject == 'commande' && $expedition->origin_id && $conf->commande->enabled)
{
print '<tr><td>'.$langs->trans("RefOrder").'</td>';
$order=new Commande($db);
@ -444,10 +445,10 @@ else
print "</td>\n";
print '</tr>';
}
else
if ($typeobject == 'propal' && $expedition->origin_id && $conf->propal->enabled)
{
$propal=new Propal($db);
$propal->fetch($livraison->origin_id);
$propal->fetch($expedition->origin_id);
print '<tr><td>'.$langs->trans("RefProposal").'</td>';
print '<td colspan="3">';
print $propal->getNomUrl(1,'expedition');
@ -606,9 +607,12 @@ else
print '</td></tr></table>';
print '<br>';
//show_list_sending_receive($expedition->origin,$expedition->origin_id," AND e.rowid <> ".$expedition->id);
show_list_sending_receive($expedition->origin,$expedition->origin_id);
if ($expedition->origin_id)
{
print '<br>';
//show_list_sending_receive($expedition->origin,$expedition->origin_id," AND e.rowid <> ".$expedition->id);
show_list_sending_receive($expedition->origin,$expedition->origin_id);
}
}
else
{