diff --git a/htdocs/expedition/tpl/linkedobjectblock.tpl.php b/htdocs/expedition/tpl/linkedobjectblock.tpl.php new file mode 100644 index 00000000000..7b08335f31f --- /dev/null +++ b/htdocs/expedition/tpl/linkedobjectblock.tpl.php @@ -0,0 +1,65 @@ + + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ +?> + + + +load("sendings"); +echo '
'; +print_titre($langs->trans('RelatedShippings')); + +?> + + + + + + + + + + > + + + + + +total_ht; +} + +?> + + + + + +
trans("Ref"); ?>trans("Date"); ?>trans("DateSendingShort"); ?>trans("AmountHTShort"); ?>trans("Status"); ?>
+ trans("ShowShipping"),"sending").' '.$object->ref; ?>date_creation,'day'); ?>date_delivery,'day'); ?>total_ht); ?>getLibStatut(3); ?>
trans('TotalHT'); ?> 
+ + \ No newline at end of file diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang index b43bff67777..90fc0c7c3e2 100644 --- a/htdocs/langs/en_US/sendings.lang +++ b/htdocs/langs/en_US/sendings.lang @@ -57,6 +57,7 @@ SendShippingRef=Send shipment %s ActionsOnShipping=Events on shipment LinkToTrackYourPackage=Link to track your package ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card. +RelatedShippings=Related shippings # Sending methods SendingMethodCATCH=Catch by customer diff --git a/htdocs/langs/fr_FR/sendings.lang b/htdocs/langs/fr_FR/sendings.lang index f703323ad04..1b316ab6c70 100644 --- a/htdocs/langs/fr_FR/sendings.lang +++ b/htdocs/langs/fr_FR/sendings.lang @@ -57,6 +57,7 @@ SendShippingRef=Envoi bon d'expédition %s ActionsOnShipping=Événements sur l'expédition LinkToTrackYourPackage=Lien pour suivi de votre colis ShipmentCreationIsDoneFromOrder=Pour le moment, la création d'une nouvelle expédition se fait depuis la fiche commande. +RelatedShippings=Expédition(s) associée(s) # Sending methods SendingMethodCATCH=Enlèvement par le client