diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index d7aa941d70b..50278c24083 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/expedition/expedition.class.php + * \file htdocs/expedition/class/expedition.class.php * \ingroup expedition * \brief Fichier de la classe de gestion des expeditions * \version $Id$ diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php index 5aa8fd9fc6f..8301481982a 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php +++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php @@ -50,7 +50,8 @@ Class pdf_expedition_merou extends ModelePdfExpedition $this->db = $db; $this->name = "merou"; - $this->description = "Modele Merou A5"; + //$this->description = "Modele Merou A5"; + $this->description = $langs->trans("DocumentModelMerou"); $this->type = 'pdf'; $this->page_largeur = 148.5; diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang index bc0787439a2..d67c84ed00b 100644 --- a/htdocs/langs/en_US/sendings.lang +++ b/htdocs/langs/en_US/sendings.lang @@ -44,6 +44,7 @@ ConfirmCancelSending=Are you sure you want to cancel this shipment ? GenericTransport=Generic transport Enlevement=Gotten by customer DocumentModelSimple=Simple document model +DocumentModelMerou=Merou A5 model WarningNoQtyLeftToSend=Warning, no products waiting to be shipped. StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated DateDeliveryPlanned=Planed date of delivery diff --git a/htdocs/langs/es_ES/sendings.lang b/htdocs/langs/es_ES/sendings.lang index 99ab10ddbc3..3e7504d5ca5 100644 --- a/htdocs/langs/es_ES/sendings.lang +++ b/htdocs/langs/es_ES/sendings.lang @@ -44,6 +44,7 @@ ConfirmCancelSending=¿Está seguro de querer anular esta expedición? GenericTransport=Transporte genérico Enlevement=Pick-up por el cliente DocumentModelSimple=Modelo simple +DocumentModelMerou=Modèle Merou A5 WarningNoQtyLeftToSend=Alerta, ningún producto en espera de envío. StatsOnShipmentsOnlyValidated=Estadísticas realizadas únicamente sobre las expediciones validadas DateDeliveryPlanned=Fecha prevista de entrega diff --git a/htdocs/langs/fr_FR/sendings.lang b/htdocs/langs/fr_FR/sendings.lang index 878b8197e45..85fc9071538 100644 --- a/htdocs/langs/fr_FR/sendings.lang +++ b/htdocs/langs/fr_FR/sendings.lang @@ -44,6 +44,7 @@ ConfirmCancelSending=Êtes-vous sûr de vouloir annuler cette expédition ? GenericTransport=Transporteur générique Enlevement=Enlèvement sur place par le client DocumentModelSimple=Modèle simple +DocumentModelMerou=Modèle Merou A5 WarningNoQtyLeftToSend=Alerte, aucun produit en attente de livraison. StatsOnShipmentsOnlyValidated=Statistiques effectuées sur les expéditions validées uniquement DateDeliveryPlanned=Date livraison prévue