Merge pull request #10445 from grandoc/new_branch_29_01_2019

fix translation
Dolibarr · Jan 30, 2019 · 46fcb53 · 46fcb53
2 parents c354656 + e5d6c55
commit 46fcb53
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
@@ -205,8 +205,7 @@
 
 	    $date_delivery = dol_mktime(GETPOST('date_deliveryhour','int'), GETPOST('date_deliverymin','int'), 0, GETPOST('date_deliverymonth','int'), GETPOST('date_deliveryday','int'), GETPOST('date_deliveryyear','int'));
 
-	    // On va boucler sur chaque ligne du document d'origine pour completer objet expedition
-	    // avec info diverses + qte a livrer
+	    // We will loop on each line of the original document to complete the shipping object with various info and quantity to deliver
 	    $classname = ucfirst($object->origin);
 	    $objectsrc = new $classname($db);
 	    $objectsrc->fetch($object->origin_id);
@@ -839,13 +838,13 @@
 		}
 		else
 		{
-			header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // Pour reaffichage de la fiche en cours d'edition
+			header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // To redisplay the form being edited
 			exit();
 		}
 	}
 
 	elseif ($action == 'updateline' && $user->rights->expedition->creer && GETPOST('cancel','alpha') == $langs->trans('Cancel')) {
-		header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // Pour reaffichage de la fiche en cours d'edition
+		header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // To redisplay the form being edited
 		exit();
 	}