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

fix warning

Browse Source
This commit is contained in:
Frédéric FRANCE 2022-10-14 10:55:14 +02:00
parent 555f17f846
commit 01ad3d98b7
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
htdocs/core/class/commonobject.class.php
View File

@ -4917,15 +4917,18 @@ abstract class CommonObject
// Note: This is deprecated. If you need to overwrite the tpl file, use instead the hook. // Note: This is deprecated. If you need to overwrite the tpl file, use instead the hook.
$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir)); $dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
foreach ($dirtpls as $module => $reldir) { foreach ($dirtpls as $module => $reldir) {
$res = 0;
if (!empty($module)) { if (!empty($module)) {
$tpl = dol_buildpath($reldir.'/objectline_title.tpl.php'); $tpl = dol_buildpath($reldir.'/objectline_title.tpl.php');
} else { } else {
$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_title.tpl.php'; $tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_title.tpl.php';
} }
if (empty($conf->file->strict_mode)) { if (file_exists($tpl)) {
$res = @include $tpl; if (empty($conf->file->strict_mode)) {
} else { $res = @include $tpl;
$res = include $tpl; // for debug } else {
$res = include $tpl; // for debug
}
} }
if ($res) { if ($res) {
break; break;
@ -5040,16 +5043,18 @@ abstract class CommonObject
// Note: This is deprecated. If you need to overwrite the tpl file, use instead the hook printObjectLine and printObjectSubLine. // Note: This is deprecated. If you need to overwrite the tpl file, use instead the hook printObjectLine and printObjectSubLine.
$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir)); $dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
foreach ($dirtpls as $module => $reldir) { foreach ($dirtpls as $module => $reldir) {
$res = 0;
if (!empty($module)) { if (!empty($module)) {
$tpl = dol_buildpath($reldir.'/objectline_view.tpl.php'); $tpl = dol_buildpath($reldir.'/objectline_view.tpl.php');
} else { } else {
$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_view.tpl.php'; $tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_view.tpl.php';
} }
if (file_exists($tpl)) {
if (empty($conf->file->strict_mode)) { if (empty($conf->file->strict_mode)) {
$res = @include $tpl; $res = @include $tpl;
} else { } else {
$res = include $tpl; // for debug $res = include $tpl; // for debug
}
} }
if ($res) { if ($res) {
break; break;

2
htdocs/core/class/html.form.class.php
View File

@ -8887,7 +8887,7 @@ class Form
$form = new Form($this->db); $form = new Form($this->db);
print $form->textwithpicto('', $langs->trans("InformationOnLinkToContract")).' '; print $form->textwithpicto('', $langs->trans("InformationOnLinkToContract")).' ';
} }
print '<span class="amount">'.price($objp->total_ht).'</span>'; print '<span class="amount">'.(isset($objp->total_ht) ? price($objp->total_ht) : '').'</span>';
print '</td>'; print '</td>';
print '<td>'.$objp->name.'</td>'; print '<td>'.$objp->name.'</td>';
print '</tr>'; print '</tr>';