diff --git a/htdocs/core/modules/expedition/modules_expedition.php b/htdocs/core/modules/expedition/modules_expedition.php index a22ae0d0f99..583e315d564 100644 --- a/htdocs/core/modules/expedition/modules_expedition.php +++ b/htdocs/core/modules/expedition/modules_expedition.php @@ -5,7 +5,7 @@ * Copyright (C) 2005-2011 Regis Houssin * Copyright (C) 2006 Andre Cianfarani * Copyright (C) 2011 Juanjo Menent - * Copyright (C) 2011-2013 Philippe Grand + * Copyright (C) 2011-2019 Philippe Grand * Copyright (C) 2014 Marcos GarcĂ­a * * This program is free software; you can redistribute it and/or modify @@ -44,7 +44,7 @@ abstract class ModelePdfExpedition extends CommonDocGenerator // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps /** - * Return list of active generation modules + * Return list of active generation models * * @param DoliDB $db Database handler * @param integer $maxfilenamelength Max length of value to show @@ -56,12 +56,12 @@ abstract class ModelePdfExpedition extends CommonDocGenerator global $conf; $type='shipping'; - $liste=array(); + $list=array(); include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; - $liste=getListOfModels($db,$type,$maxfilenamelength); + $list=getListOfModels($db,$type,$maxfilenamelength); - return $liste; + return $list; } } @@ -112,7 +112,7 @@ abstract class ModelNumRefExpedition /** * Test if existing numbers make problems with numbering * - * @return boolean false if conflit, true if ok + * @return boolean false if conflict, true if ok */ function canBeActivated() {