Merge branch 'dev_EventOrganisation' of github.com:FHenry/dolibarr into dev_EventOrganisation

This commit is contained in:
Florian HENRY 2021-02-27 15:35:17 +01:00
commit 045a96e415
2 changed files with 0 additions and 2 deletions

View File

@ -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;

View File

@ -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');