diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php index 809b87820d7..de659a9c185 100644 --- a/htdocs/expedition/index.php +++ b/htdocs/expedition/index.php @@ -149,7 +149,9 @@ if ( $db->query($sql) ) print $orderstatic->getNomUrl(1); print ''; print ''; - print ''.dol_trunc($obj->nom,20).''; + $companystatic->nom=$obj->nom; + $companystatic->id=$obj->socid; + print $companystatic->getNomUrl(1,'customer'); print ''; $i++; } @@ -199,7 +201,11 @@ if ( $resql ) $orderstatic->ref=$obj->ref; print $orderstatic->getNomUrl(1); print ''; - print ''.$obj->nom.''; + print ''; + $companystatic->nom=$obj->nom; + $companystatic->id=$obj->socid; + print $companystatic->getNomUrl(1,'customer'); + print ''; $i++; } print "
"; diff --git a/htdocs/includes/menus/barre_left/eldy.lib.php b/htdocs/includes/menus/barre_left/eldy.lib.php index 890d05c1927..4bfc8f6db4d 100644 --- a/htdocs/includes/menus/barre_left/eldy.lib.php +++ b/htdocs/includes/menus/barre_left/eldy.lib.php @@ -641,7 +641,7 @@ function print_left_eldy_menu($db,$menu_array) if ($conf->expedition->enabled) { $langs->load("sendings"); - $newmenu->add(DOL_URL_ROOT."/expedition/index.php?leftmenu=sendings", $langs->trans("Sendings"), 0, $user->rights->expedition->lire); + $newmenu->add(DOL_URL_ROOT."/expedition/index.php?leftmenu=sendings", $langs->trans("Shipments"), 0, $user->rights->expedition->lire); if ($leftmenu=="sendings") $newmenu->add(DOL_URL_ROOT."/expedition/liste.php?leftmenu=sendings", $langs->trans("List"), 1 ,$user->rights->expedition->lire); if ($leftmenu=="sendings") $newmenu->add(DOL_URL_ROOT."/expedition/stats/index.php?leftmenu=sendings", $langs->trans("Statistics"), 1 ,$user->rights->expedition->lire); }