From 0180014d4d76f249a2807acc909bf9b7c20b24e3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 23 Oct 2019 01:35:32 +0200 Subject: [PATCH] Fix link in popup of shipment --- htdocs/expedition/card.php | 2 +- htdocs/langs/en_US/main.lang | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index a7e5f1866f9..9ead4f64aac 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -2257,7 +2257,7 @@ elseif ($id || $ref) if (! empty($conf->stock->enabled) && $shipmentline_var['warehouse'] > 0) { $warehousestatic->fetch($shipmentline_var['warehouse']); - $htmltext .= '
'.$langs->trans("From").' : '.$warehousestatic->getNomUrl(1); + $htmltext .= '
'.$langs->trans("FromLocation").' : '.$warehousestatic->getNomUrl(1, '', 0, 1); } print ' '.$form->textwithpicto('', $htmltext, 1); } diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 656f6fb7a28..c176d06aff4 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -476,6 +476,7 @@ Categories=Tags/categories Category=Tag/category By=By From=From +FromLocation=From to=to and=and or=or