diff --git a/htdocs/includes/triggers/interface_fraisport.class.php-NORUN b/htdocs/includes/triggers/interface_fraisport.class.php-NORUN index ac9a6c86108..d4929049e5a 100644 --- a/htdocs/includes/triggers/interface_fraisport.class.php-NORUN +++ b/htdocs/includes/triggers/interface_fraisport.class.php-NORUN @@ -101,18 +101,18 @@ class InterfaceFraisport { if ($action == 'LINEORDER_INSERT') { - return $this->_add_line_haulier($action,$object,$user,$langs,$conf); + return $this->_add_line_carrier($action,$object,$user,$langs,$conf); } if ($action == 'LINEORDER_DELETE') { - return $this->_add_line_haulier($action,$object,$user,$langs,$conf); + return $this->_add_line_carrier($action,$object,$user,$langs,$conf); } // Renvoi 0 car aucune action de faite return 0; } - function _add_line_haulier($action,$object,$user,$langs,$conf) + function _add_line_carrier($action,$object,$user,$langs,$conf) { // Ajoute une ligne de frais de port automatiquement // diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang index aad05e5346f..3d3fd8b7d85 100644 --- a/htdocs/langs/en_US/sendings.lang +++ b/htdocs/langs/en_US/sendings.lang @@ -17,10 +17,11 @@ CreateASending=Create a sending CreateSending=Create sending QtyOrdered=Qty ordered QtyShipped=Qty shipped -QtyReceived=Qty received QtyToShip=Qty to ship +QtyReceived=Qty received KeepToShip=Keep to ship OtherSendingsForSameOrder=Other sendings for this order +DateSending=Date sending SendingsForSameOrder=Sendings for this order SendingsAndReceivingForSameOrder=Sendings and receivings for this order SendingsToValidate=Sending to validate @@ -29,3 +30,7 @@ StatusSendingValidated=Validated (products to ship or already shipped) StatusSendingDraftShort=Draft StatusSendingValidatedShort=Validated SendingSheet=Sending sheet +Carriers=Carriers +Carrier=Carrier +CarriersArea=Carriers area +NewCarrier=New carrier \ No newline at end of file diff --git a/htdocs/langs/fr_FR/sendings.lang b/htdocs/langs/fr_FR/sendings.lang index e23c3e67523..a08951c3234 100644 --- a/htdocs/langs/fr_FR/sendings.lang +++ b/htdocs/langs/fr_FR/sendings.lang @@ -13,14 +13,15 @@ StatisticsOfSendings=Statistiques des exp NbOfSendings=Nombre d'expéditions SendingCard=Fiche expédition NewSending=Nouvelle expédition -CreateASending=Créer une expedition -CreateSending=Créer expedition +CreateASending=Créer une expédition +CreateSending=Créer expédition QtyOrdered=Qté commandée QtyShipped=Qté expédiée QtyToShip=Qté à expédier QtyReceived=Qté reçue KeepToShip=Reste à expédier OtherSendingsForSameOrder=Autres expéditions pour cette commande +DateSending=Date d'expédition SendingsForSameOrder=Expéditions pour cette commande SendingsAndReceivingForSameOrder=Expéditions et réceptions pour cette commande SendingsToValidate=Expéditions à valider @@ -29,7 +30,7 @@ StatusSendingValidated=Valid StatusSendingDraftShort=Brouillon StatusSendingValidatedShort=Validée SendingSheet=Bordereau d'expédition -Hauliers=Transporteurs -Haulier=Transporteur -HauliersArea=Espace transporteurs -NewHaulier=Nouveau transporteur \ No newline at end of file +Carriers=Transporteurs +Carrier=Transporteur +CarriersArea=Espace transporteurs +NewCarrier=Nouveau transporteur \ No newline at end of file