diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php index 158cea4fe09..881a0bcd61d 100644 --- a/htdocs/core/class/html.formactions.class.php +++ b/htdocs/core/class/html.formactions.class.php @@ -125,6 +125,7 @@ class FormActions if ($typeelement == 'order') $title=$langs->trans('ActionsOnOrder'); if ($typeelement == 'order_supplier' || $typeelement == 'supplier_order') $title=$langs->trans('ActionsOnOrder'); if ($typeelement == 'project') $title=$langs->trans('ActionsOnProject'); + if ($typeelement == 'shipping') $title=$langs->trans('ActionsOnShipping'); print_titre($title); diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index 332477d818c..8e3683c89dd 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -1270,10 +1270,10 @@ else } print ''; + print "
\n"; } - print "\n"; - print '
'; + print '
'; /* diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang index b5747aba519..3a84f4156da 100644 --- a/htdocs/langs/en_US/sendings.lang +++ b/htdocs/langs/en_US/sendings.lang @@ -52,6 +52,7 @@ DateDeliveryPlanned=Planed date of delivery DateReceived=Date delivery received SendShippingByEMail=Send shipping by EMail SendShippingRef=Send shipping %s +ActionsOnShipping=Acions on shipping # Sending methods SendingMethodCATCH=Catch by customer diff --git a/htdocs/langs/fr_FR/sendings.lang b/htdocs/langs/fr_FR/sendings.lang index 34d00985fa4..96279d8a474 100644 --- a/htdocs/langs/fr_FR/sendings.lang +++ b/htdocs/langs/fr_FR/sendings.lang @@ -52,6 +52,7 @@ DateDeliveryPlanned=Date livraison prévue DateReceived=Date réception réelle SendShippingByEMail=Envoi bon d'expédition par EMail SendShippingRef=Envoi bon d'expédition %s +ActionsOnShipping=Événements sur l'expédition # Sending methods SendingMethodCATCH=Enlèvement par le client