Merge pull request #12353 from frederic34/patch-17

can't have static and $this at same time
This commit is contained in:
Laurent Destailleur 2019-11-07 11:32:55 +01:00 committed by GitHub
commit 3fcc72f504
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -396,16 +396,11 @@ class Inventory extends CommonObject
// phpcs:enable
global $langs;
if (empty($this->labelStatus))
{
global $langs;
//$langs->load("mrp");
$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Canceled');
}
$labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
$labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
$labelStatus[self::STATUS_CANCELED] = $langs->trans('Canceled');
return dolGetStatus($this->labelStatus[$status], $this->labelStatus[$status], '', 'status'.$status, $mode);
return dolGetStatus($labelStatus[$status], $labelStatus[$status], '', 'status'.$status, $mode);
}
/**