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

Fix else if

Browse Source
This commit is contained in:
Laurent Destailleur 2020-01-27 02:13:12 +01:00
parent 2d77765613
commit 50d9ac0b52
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/functions.lib.php
View File

@ -2064,7 +2064,7 @@ function dol_now($mode = 'gmt')
$tzsecond = getServerTimeZoneInt('now'); // Contains tz+dayling saving time $tzsecond = getServerTimeZoneInt('now'); // Contains tz+dayling saving time
$ret = (int) (dol_now('gmt') + ($tzsecond * 3600)); $ret = (int) (dol_now('gmt') + ($tzsecond * 3600));
} }
/*else if ($mode == 'tzref') // Time for now with parent company timezone is added /*elseif ($mode == 'tzref') // Time for now with parent company timezone is added
{ {
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
$tzsecond=getParentCompanyTimeZoneInt(); // Contains tz+dayling saving time $tzsecond=getParentCompanyTimeZoneInt(); // Contains tz+dayling saving time

2
htdocs/core/lib/pdf.lib.php
View File

@ -2154,7 +2154,7 @@ function pdf_getLinkedObjects($object, $outputlangs)
$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date_contrat, 'day', '', $outputlangs); $linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date_contrat, 'day', '', $outputlangs);
} }
} }
else if ($objecttype == 'fichinter') elseif ($objecttype == 'fichinter')
{ {
$outputlangs->load('interventions'); $outputlangs->load('interventions');
foreach($objects as $elementobject) foreach($objects as $elementobject)

2
htdocs/core/lib/project.lib.php
View File

@ -935,7 +935,7 @@ function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projec
// Warning // Warning
print '<td class="right">'; print '<td class="right">';
/*if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject")); /*if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
else if ($disabledtask) elseif ($disabledtask)
{ {
$titleassigntask = $langs->trans("AssignTaskToMe"); $titleassigntask = $langs->trans("AssignTaskToMe");
if ($fuser->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", '...'); if ($fuser->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", '...');