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));
|
$repid[$idforallfornewmodule] = $langs->trans("ActionAC_ALL_".strtoupper($obj->module));
|
||||||
$repcode['AC_ALL_'.strtoupper($obj->module)] = '-- '.$langs->trans("Module").' '.ucfirst($obj->module);
|
$repcode['AC_ALL_'.strtoupper($obj->module)] = '-- '.$langs->trans("Module").' '.ucfirst($obj->module);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
$repid[$obj->id] = $label;
|
$repid[$obj->id] = $label;
|
||||||
$repcode[$obj->code] = $label;
|
$repcode[$obj->code] = $label;
|
||||||
|
|||||||
@ -748,7 +748,6 @@ class ConferenceOrBooth extends CommonObject
|
|||||||
// phpcs:enable
|
// phpcs:enable
|
||||||
if (empty($this->labelStatus) || empty($this->labelStatusShort))
|
if (empty($this->labelStatus) || empty($this->labelStatusShort))
|
||||||
{
|
{
|
||||||
|
|
||||||
global $langs;
|
global $langs;
|
||||||
//$langs->load("eventorganization@eventorganization");
|
//$langs->load("eventorganization@eventorganization");
|
||||||
$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
|
$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user