From 4dca8eb7bf6639e108f07a37cc00a43b639724c6 Mon Sep 17 00:00:00 2001 From: Mohamed DAOUD Date: Thu, 25 Jul 2024 18:23:31 +0200 Subject: [PATCH] add column to societe account table (#30442) Co-authored-by: Laurent Destailleur --- .../install/mysql/migration/20.0.0-21.0.0.sql | 2 ++ .../mysql/tables/llx_societe_account.sql | 19 ++++++++++--------- htdocs/societe/class/societeaccount.class.php | 3 ++- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/htdocs/install/mysql/migration/20.0.0-21.0.0.sql b/htdocs/install/mysql/migration/20.0.0-21.0.0.sql index 5294aca0f5f..2a21c7aa4b1 100644 --- a/htdocs/install/mysql/migration/20.0.0-21.0.0.sql +++ b/htdocs/install/mysql/migration/20.0.0-21.0.0.sql @@ -76,5 +76,7 @@ UPDATE llx_c_hrm_public_holiday SET entity = 1 WHERE entity = 0; ALTER TABLE llx_c_hrm_public_holiday ADD UNIQUE INDEX uk_c_hrm_public_holiday(entity, code); ALTER TABLE llx_c_hrm_public_holiday ADD UNIQUE INDEX uk_c_hrm_public_holiday2(entity, fk_country, dayrule, day, month, year); +ALTER TABLE llx_societe_account ADD COLUMN date_last_reset_password datetime after date_previous_login; + -- Rename of bank table ALTER TABLE llx_bank_categ RENAME TO llx_category_bank; \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_societe_account.sql b/htdocs/install/mysql/tables/llx_societe_account.sql index 87f95a1805e..ba5c586bc64 100644 --- a/htdocs/install/mysql/tables/llx_societe_account.sql +++ b/htdocs/install/mysql/tables/llx_societe_account.sql @@ -20,24 +20,25 @@ CREATE TABLE llx_societe_account( -- BEGIN MODULEBUILDER FIELDS rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, entity integer DEFAULT 1, - - login varchar(128) NOT NULL, -- a login string into website or external system + + login varchar(128) NOT NULL, -- a login string into website or external system pass_encoding varchar(24), pass_crypted varchar(128), -- the hashed password pass_temp varchar(128), -- temporary password when asked for forget password fk_soc integer, -- if entry is linked to a thirdparty fk_website integer, -- id of local web site (if dk_website is filled, site is empty) site varchar(128) NOT NULL, -- name of external web site (if site is filled, fk_website is empty) - site_account varchar(128), -- a key to identify the account on external web site (for example: 'stripe', 'paypal', 'myextapp') + site_account varchar(128), -- a key to identify the account on external web site (for example: 'stripe', 'paypal', 'myextapp') key_account varchar(128), -- the id of an account in external web site (for site_account if site_account defined. some sites needs both an account name and a login that is different) note_private text, date_last_login datetime, date_previous_login datetime, - date_creation datetime NOT NULL, - tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - fk_user_creat integer NOT NULL, - fk_user_modif integer, - import_key varchar(14), - status integer + date_last_reset_password datetime, + date_creation datetime NOT NULL, + tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + fk_user_creat integer NOT NULL, + fk_user_modif integer, + import_key varchar(14), + status integer -- END MODULEBUILDER FIELDS ) ENGINE=innodb; diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php index 24526d50370..6488fb4e9e5 100644 --- a/htdocs/societe/class/societeaccount.class.php +++ b/htdocs/societe/class/societeaccount.class.php @@ -110,6 +110,7 @@ class SocieteAccount extends CommonObject 'key_account' => array('type' => 'varchar(128)', 'label' => 'KeyAccount', 'visible' => 0, 'enabled' => 1, 'position' => 48, 'notnull' => 0, 'index' => 1, 'searchall' => 1, 'comment' => 'The id of third party in the external web site (for site_account if site_account defined)',), 'date_last_login' => array('type' => 'datetime', 'label' => 'LastConnexion', 'visible' => 2, 'enabled' => 1, 'position' => 50, 'notnull' => 0,), 'date_previous_login' => array('type' => 'datetime', 'label' => 'PreviousConnexion', 'visible' => 2, 'enabled' => 1, 'position' => 51, 'notnull' => 0,), + 'date_last_reset_password' => array('type' => 'datetime', 'label' => 'PreviousResetPassword', 'visible' => 0, 'enabled' => 1, 'position' => 53, 'notnull' => 0,), //'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'visible'=>-1, 'enabled'=>1, 'position'=>45, 'notnull'=>-1,), 'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'visible' => -1, 'enabled' => 1, 'position' => 46, 'notnull' => -1,), 'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'visible' => -2, 'enabled' => 1, 'position' => 500, 'notnull' => 1,), @@ -149,7 +150,7 @@ class SocieteAccount extends CommonObject */ public $date_last_login; - + public $date_last_reset_password; public $date_previous_login; public $note_private;