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

FIX closing tags

Browse Source
This commit is contained in:
Laurent Destailleur 2020-03-22 02:44:00 +01:00
parent 4ce1665a15
commit bcf17c79ef
1 changed files with 77 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/lib/company.lib.php
View File

@ -1317,6 +1317,8 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
} }
$sortfield_new = implode(',', $sortfield_new_list); $sortfield_new = implode(',', $sortfield_new_list);
$sql = '';
if (!empty($conf->agenda->enabled)) if (!empty($conf->agenda->enabled))
{ {
// Recherche histo sur actioncomm // Recherche histo sur actioncomm
@ -1468,6 +1470,8 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
} }
//TODO Add limit in nb of results //TODO Add limit in nb of results
if ($sql)
{
$sql .= $db->order($sortfield_new, $sortorder); $sql .= $db->order($sortfield_new, $sortorder);
dol_syslog("company.lib::show_actions_done", LOG_DEBUG); dol_syslog("company.lib::show_actions_done", LOG_DEBUG);
$resql = $db->query($sql); $resql = $db->query($sql);
@ -1548,6 +1552,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
{ {
dol_print_error($db); dol_print_error($db);
} }
}
if (!empty($conf->agenda->enabled) || (!empty($conf->mailing->enabled) && !empty($objcon->email))) if (!empty($conf->agenda->enabled) || (!empty($conf->mailing->enabled) && !empty($objcon->email)))
{ {
@ -1781,9 +1786,9 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
} }
$out .= "</table>\n"; $out .= "</table>\n";
$out .= "</div>\n"; $out .= "</div>\n";
}
$out .= '</form>'; $out .= '</form>';
}
if ($noprint) return $out; if ($noprint) return $out;
else print $out; else print $out;