diff --git a/htdocs/admin/schedule.php b/htdocs/admin/openinghours.php similarity index 98% rename from htdocs/admin/schedule.php rename to htdocs/admin/openinghours.php index 06c6bd19062..19225273bfc 100644 --- a/htdocs/admin/schedule.php +++ b/htdocs/admin/openinghours.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/admin/accountant.php + * \file htdocs/admin/openinghours.php * \ingroup accountant * \brief Setup page to configure accountant / auditor */ @@ -82,7 +82,7 @@ print load_fiche_titre($langs->trans("CompanyFoundation"),'','title_setup'); $head = company_admin_prepare_head(); -dol_fiche_head($head, 'schedule', $langs->trans("Company"), -1, 'company'); +dol_fiche_head($head, 'openinghours', $langs->trans("Company"), -1, 'company'); $form=new Form($db); $formother=new FormOther($db); @@ -90,7 +90,7 @@ $formcompany=new FormCompany($db); $countrynotdefined=''.$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')'; -print ''.$langs->trans("ScheduleDesc")."
\n"; +print ''.$langs->trans("OpeningHoursDesc")."
\n"; print "
\n"; if ($action == 'edit' || $action == 'updateedit') diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php index 8898670630a..aae550d65f8 100644 --- a/htdocs/core/lib/admin.lib.php +++ b/htdocs/core/lib/admin.lib.php @@ -1712,15 +1712,18 @@ function company_admin_prepare_head() $head[$h][2] = 'company'; $h++; + if ($conf->global->MAIN_FEATURES_LEVEL >= 2) + { + $head[$h][0] = DOL_URL_ROOT."/admin/openinghours.php"; + $head[$h][1] = $langs->trans("OpeningHours"); + $head[$h][2] = 'openinghours'; + $h++; + } + $head[$h][0] = DOL_URL_ROOT."/admin/accountant.php"; $head[$h][1] = $langs->trans("Accountant"); $head[$h][2] = 'accountant'; $h++; - - $head[$h][0] = DOL_URL_ROOT."/admin/schedule.php"; - $head[$h][1] = $langs->trans("Schedule"); - $head[$h][2] = 'schedule'; - $h++; complete_head_from_modules($conf,$langs,null,$head,$h,'company_admin','remove'); diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 61a252e11d8..1a731e20b05 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1844,6 +1844,8 @@ FormatZip=Zip MainMenuCode=Menu entry code (mainmenu) ECMAutoTree=Show automatic ECM tree OperationParamDesc=Define values to use for action, or how to extract values. For example:
VALUE:abc
REGEX:SUBJECT:([^\s]*)
REGEX:BODY:My company name is\s([^\s]*) +OpeningHours=Opening hours +OpeningHoursDesc=Enter here the regular opening hours of your company. ##### Resource #### ResourceSetup=Configuration of Resource module UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).