Merge pull request #4304 from marcosgdf/bug-4302

FIX #4302 Undefined variable $conf in Commande::LibStatut
This commit is contained in:
Laurent Destailleur 2015-12-27 17:37:02 +01:00
commit 80989fd2c9

View File

@ -2947,7 +2947,7 @@ class Commande extends CommonOrder
*/ */
function LibStatut($statut,$billed,$mode) function LibStatut($statut,$billed,$mode)
{ {
global $langs; global $langs, $conf;
//print 'x'.$statut.'-'.$billed; //print 'x'.$statut.'-'.$billed;
if ($mode == 0) if ($mode == 0)
{ {