diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon index 69598de2dbb..468cfb9ff03 100644 --- a/dev/build/phpstan/phpstan-baseline.neon +++ b/dev/build/phpstan/phpstan-baseline.neon @@ -11922,12 +11922,6 @@ parameters: count: 4 path: ../../../htdocs/eventorganization/core/actions_massactions_mail.inc.php - - - message: '#^Variable \$object might not be defined\.$#' - identifier: variable.undefined - count: 1 - path: ../../../htdocs/eventorganization/tpl/linkedobjectblock.tpl.php - - message: '#^If condition is always true\.$#' identifier: if.alwaysTrue @@ -15576,12 +15570,6 @@ parameters: count: 2 path: ../../../htdocs/mrp/mo_production.php - - - message: '#^Variable \$action might not be defined\.$#' - identifier: variable.undefined - count: 1 - path: ../../../htdocs/mrp/tpl/linkedobjectblock.tpl.php - - message: '#^Parameter \#1 \$object of method MultiCurrencies\:\:_cleanObjectDatasRate\(\) expects MultiCurrency, CurrencyRate given\.$#' identifier: argument.type diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 76214e0b5e3..b92f93dfb38 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -1463,7 +1463,7 @@ class Adherent extends CommonObject $sql .= " d.email, d.url, d.socialnetworks, d.phone, d.phone_perso, d.phone_mobile, d.login, d.pass, d.pass_crypted,"; $sql .= " d.photo, d.fk_adherent_type, d.morphy, d.entity,"; $sql .= " d.datec as datec,"; - $sql .= " d.tms as datem,"; + $sql .= " GREATEST(d.tms, aef.tms) as datem,"; $sql .= " d.datefin as datefin, d.default_lang,"; $sql .= " d.birth as birthday,"; $sql .= " d.datevalid as datev,"; @@ -1475,6 +1475,7 @@ class Adherent extends CommonObject $sql .= " t.libelle as type, t.subscription as subscription,"; $sql .= " u.rowid as user_id, u.login as user_login"; $sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as t, ".MAIN_DB_PREFIX."adherent as d"; + $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'adherent_extrafields as aef ON aef.fk_object = d.rowid'; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON d.country = c.rowid"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as dep ON d.state_id = dep.rowid"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON d.rowid = u.fk_member"; @@ -2973,9 +2974,10 @@ class Adherent extends CommonObject { $sql = 'SELECT a.rowid, a.datec as datec,'; $sql .= ' a.datevalid as datev,'; - $sql .= ' a.tms as datem,'; + $sql .= ' GREATEST(a.tms, aef.tms) as datem,'; $sql .= ' a.fk_user_author, a.fk_user_valid, a.fk_user_mod'; $sql .= ' FROM '.MAIN_DB_PREFIX.'adherent as a'; + $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'adherent_extrafields as aef ON aef.fk_object = a.rowid'; $sql .= ' WHERE a.rowid = '.((int) $id); dol_syslog(get_class($this)."::info", LOG_DEBUG); diff --git a/htdocs/admin/tools/ui/experimental/experiments/intuitive-select/index.php b/htdocs/admin/tools/ui/experimental/experiments/intuitive-select/index.php index 0f141d15c58..2b32616f9f2 100644 --- a/htdocs/admin/tools/ui/experimental/experiments/intuitive-select/index.php +++ b/htdocs/admin/tools/ui/experimental/experiments/intuitive-select/index.php @@ -313,6 +313,9 @@ $form = new Form($db); }