lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean code

Browse Source
This commit is contained in:
Laurent Destailleur 2019-01-16 12:42:54 +01:00
parent 3e86ec83e2
commit c357cb8c4e
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/admin/schedule.php → htdocs/admin/openinghours.php
View File

@ -16,7 +16,7 @@
*/ */
/** /**
* \file htdocs/admin/accountant.php * \file htdocs/admin/openinghours.php
* \ingroup accountant * \ingroup accountant
* \brief Setup page to configure accountant / auditor * \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(); $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); $form=new Form($db);
$formother=new FormOther($db); $formother=new FormOther($db);
@ -90,7 +90,7 @@ $formcompany=new FormCompany($db);
$countrynotdefined='<font class="error">'.$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')</font>'; $countrynotdefined='<font class="error">'.$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')</font>';
print '<span class="opacitymedium">'.$langs->trans("ScheduleDesc")."</span><br>\n"; print '<span class="opacitymedium">'.$langs->trans("OpeningHoursDesc")."</span><br>\n";
print "<br>\n"; print "<br>\n";
if ($action == 'edit' || $action == 'updateedit') if ($action == 'edit' || $action == 'updateedit')

13
htdocs/core/lib/admin.lib.php
View File

@ -1712,16 +1712,19 @@ function company_admin_prepare_head()
$head[$h][2] = 'company'; $head[$h][2] = 'company';
$h++; $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][0] = DOL_URL_ROOT."/admin/accountant.php";
$head[$h][1] = $langs->trans("Accountant"); $head[$h][1] = $langs->trans("Accountant");
$head[$h][2] = 'accountant'; $head[$h][2] = 'accountant';
$h++; $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'); complete_head_from_modules($conf,$langs,null,$head,$h,'company_admin','remove');
return $head; return $head;

2
htdocs/langs/en_US/admin.lang
View File

@ -1844,6 +1844,8 @@ FormatZip=Zip
MainMenuCode=Menu entry code (mainmenu) MainMenuCode=Menu entry code (mainmenu)
ECMAutoTree=Show automatic ECM tree ECMAutoTree=Show automatic ECM tree
OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>VALUE:abc<br>REGEX:SUBJECT:([^\s]*)<br>REGEX:BODY:My company name is\s([^\s]*) OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>VALUE:abc<br>REGEX:SUBJECT:([^\s]*)<br>REGEX:BODY:My company name is\s([^\s]*)
OpeningHours=Opening hours
OpeningHoursDesc=Enter here the regular opening hours of your company.
##### Resource #### ##### Resource ####
ResourceSetup=Configuration of Resource module ResourceSetup=Configuration of Resource module
UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).