diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php index bb1d9d95294..f1941b8c079 100644 --- a/htdocs/user/class/api_users.class.php +++ b/htdocs/user/class/api_users.class.php @@ -747,7 +747,7 @@ class Users extends DolibarrApi unset($cleanObject->clicktodial_loaded); unset($cleanObject->datec); - unset($cleanObject->datem); + unset($cleanObject->tms); unset($cleanObject->members); unset($cleanObject->note); unset($cleanObject->note_private); diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php index 135b97bcc43..a93f7ccebfb 100644 --- a/htdocs/user/class/usergroup.class.php +++ b/htdocs/user/class/usergroup.class.php @@ -91,7 +91,7 @@ class UserGroup extends CommonObject * * @var integer */ - public $datem; + public $tms; /** * @var string Description @@ -932,7 +932,7 @@ class UserGroup extends CommonObject $this->name = 'DOLIBARR GROUP SPECIMEN'; $this->note = 'This is a note'; $this->datec = time(); - $this->datem = time(); + $this->tms = time(); // Members of this group is just me $this->members = array( diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php index 60c1c30e9fb..b9d16874604 100644 --- a/htdocs/user/group/card.php +++ b/htdocs/user/group/card.php @@ -209,6 +209,7 @@ if (empty($reshook)) { $object->name = GETPOST("nom", 'alphanohtml'); $object->note = dol_htmlcleanlastbr(trim(GETPOST("note", 'restricthtml'))); + $object->tms = dol_now(); // Fill array 'array_options' with data from add form $ret = $extrafields->setOptionalsFromPost(null, $object, '@GETPOSTISSET'); diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php index 54117de403a..85df729d00f 100644 --- a/htdocs/user/group/list.php +++ b/htdocs/user/group/list.php @@ -173,7 +173,7 @@ $morecss = array(); // Build and execute select // -------------------------------------------------------------------- -$sql = "SELECT g.rowid, g.nom as name, g.note, g.entity, g.datec, g.tms as datem, COUNT(DISTINCT ugu.fk_user) as nb, COUNT(DISTINCT ugr.fk_id) as nbpermissions"; +$sql = "SELECT g.rowid, g.nom as name, g.note, g.entity, g.datec, g.tms, COUNT(DISTINCT ugu.fk_user) as nb, COUNT(DISTINCT ugr.fk_id) as nbpermissions"; $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"; @@ -471,7 +471,7 @@ while ($i < $imaxinloop) { if (!$i) { $totalarray['nbfield']++; } - print ''.dol_print_date($db->jdate($obj->datem), "dayhour").''; + print ''.dol_print_date($db->jdate($obj->tms), "dayhour").''; if (!$i) { $totalarray['nbfield']++; }