mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
Merge branch 'dev_EventOrganisation' of github.com:FHenry/dolibarr into dev_EventOrganisation
This commit is contained in:
commit
045a96e415
|
|
@ -268,7 +268,6 @@ class CActionComm
|
|||
$repid[$idforallfornewmodule] = $langs->trans("ActionAC_ALL_".strtoupper($obj->module));
|
||||
$repcode['AC_ALL_'.strtoupper($obj->module)] = '-- '.$langs->trans("Module").' '.ucfirst($obj->module);
|
||||
}
|
||||
|
||||
}
|
||||
$repid[$obj->id] = $label;
|
||||
$repcode[$obj->code] = $label;
|
||||
|
|
|
|||
|
|
@ -748,7 +748,6 @@ class ConferenceOrBooth extends CommonObject
|
|||
// phpcs:enable
|
||||
if (empty($this->labelStatus) || empty($this->labelStatusShort))
|
||||
{
|
||||
|
||||
global $langs;
|
||||
//$langs->load("eventorganization@eventorganization");
|
||||
$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user