diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php index 2e4edc99da2..c43d0ec092f 100644 --- a/htdocs/takepos/index.php +++ b/htdocs/takepos/index.php @@ -397,7 +397,9 @@ function LoadProducts(position, issubcat) { function MoreProducts(moreorless) { console.log("MoreProducts"); - if ($('#search_pagination').val() != '') return Search2('', moreorless); + if ($('#search_pagination').val() != '') { + return Search2('', moreorless); + } var maxproduct = ; diff --git a/htdocs/ticket/index.php b/htdocs/ticket/index.php index 0128954989d..243084ec89f 100644 --- a/htdocs/ticket/index.php +++ b/htdocs/ticket/index.php @@ -109,8 +109,8 @@ if (in_array('DOLUSERCOOKIE_ticket_by_status', $autosetarray)) { } elseif (!empty($_COOKIE['DOLUSERCOOKIE_ticket_by_status'])) { $tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_ticket_by_status'], true); $endyear = $tmparray['year']; - $shownb = $tmparray['shownb']; - $showtot = $tmparray['showtot']; + $shownb = empty($tmparray['shownb']) ? 0 : $tmparray['shownb']; + $showtot = empty($tmparray['showtot']) ? 0 : $tmparray['showtot']; } if (empty($shownb) && empty($showtot)) { $showtot = 1; diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php index ab49800a8e4..4c91bd041dd 100644 --- a/htdocs/user/group/list.php +++ b/htdocs/user/group/list.php @@ -129,7 +129,7 @@ $sql = "SELECT g.rowid, g.nom as name, g.note, g.entity, g.datec, g.tms as datem $sql .= " FROM ".MAIN_DB_PREFIX."usergroup as g"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_usergroup = g.rowid"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_rights as ugr ON ugr.fk_usergroup = g.rowid"; -if (isModEnabled('multicompany') && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && !$user->entity))) { +if (isModEnabled('multicompany') && $conf->entity == 1 && (getDolGlobalInt('MULTICOMPANY_TRANSVERSE_MODE') || ($user->admin && !$user->entity))) { $sql .= " WHERE g.entity IS NOT NULL"; } else { $sql .= " WHERE g.entity IN (0,".$conf->entity.")";