Skip to content

Commit

Permalink
Fixed CR
Browse files Browse the repository at this point in the history
  • Loading branch information
marcosgdf committed May 7, 2014
1 parent 7fe5389 commit 8681079
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion htdocs/core/modules/modExpedition.class.php
Expand Up @@ -102,7 +102,7 @@ function __construct($db)
$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/shipment";
$this->const[$r][3] = "";
$this->const[$r][4] = 0;
$r++;
$r++;

$this->const[$r][0] = "LIVRAISON_ADDON_PDF";
$this->const[$r][1] = "chaine";
Expand Down
16 changes: 8 additions & 8 deletions htdocs/livraison/fiche.php
Expand Up @@ -514,16 +514,16 @@
// Shipment
if (($delivery->origin == 'shipment' || $delivery->origin == 'expedition') && $delivery->origin_id > 0)
{
$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/liste.php">'.$langs->trans("BackToList").'</a>';

// Ref
print '<tr><td width="20%">'.$langs->trans("RefSending").'</td>';
print '<td colspan="3">';
$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/liste.php">'.$langs->trans("BackToList").'</a>';

// Ref
print '<tr><td width="20%">'.$langs->trans("RefSending").'</td>';
print '<td colspan="3">';
// Nav is hidden because on a delivery receipt of a shipment, if we go on next shipment, we may find no tab (a shipment may not have delivery receipt yet)
//print $form->showrefnav($expedition, 'refshipment', $linkback, 1, 'ref', 'ref');
//print $form->showrefnav($expedition, 'refshipment', $linkback, 1, 'ref', 'ref');
print $form->showrefnav($expedition, 'refshipment', $linkback, 0, 'ref', 'ref');
print '</td></tr>';
}
print '</td></tr>';
}

// Ref
print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
Expand Down

0 comments on commit 8681079

Please sign in to comment.