Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
- Loading branch information
Showing
13 changed files
with
94 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
-- Copyright (C) 2016 Laurent Destailleur <eldy@users.sourceforge.net> | ||
-- | ||
-- This program is free software: you can redistribute it and/or modify | ||
-- it under the terms of the GNU General Public License as published by | ||
-- the Free Software Foundation, either version 3 of the License, or | ||
-- (at your option) any later version. | ||
-- | ||
-- This program is distributed in the hope that it will be useful, | ||
-- but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
-- GNU General Public License for more details. | ||
-- | ||
-- You should have received a copy of the GNU General Public License | ||
-- along with this program. If not, see http://www.gnu.org/licenses/. | ||
|
||
|
||
-- BEGIN MODULEBUILDER INDEXES | ||
ALTER TABLE llx_website_account ADD INDEX idx_website_account_rowid (rowid); | ||
ALTER TABLE llx_website_account ADD INDEX idx_website_account_login (login); | ||
ALTER TABLE llx_website_account ADD INDEX idx_website_account_import_key (import_key); | ||
ALTER TABLE llx_website_account ADD INDEX idx_website_account_status (status); | ||
ALTER TABLE llx_website_account ADD INDEX idx_website_account_fk_soc (fk_soc); | ||
ALTER TABLE llx_website_account ADD INDEX idx_website_account_fk_website (fk_website); | ||
-- END MODULEBUILDER INDEXES | ||
|
||
ALTER TABLE llx_website_account ADD UNIQUE INDEX uk_website_account_login_website_soc(login, fk_website, fk_soc); | ||
|
||
ALTER TABLE llx_website_account ADD CONSTRAINT llx_website_account_fk_website FOREIGN KEY (fk_website) REFERENCES llx_website(rowid); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
-- Copyright (C) 2016 Laurent Destailleur <eldy@users.sourceforge.net> | ||
-- | ||
-- This program is free software: you can redistribute it and/or modify | ||
-- it under the terms of the GNU General Public License as published by | ||
-- the Free Software Foundation, either version 3 of the License, or | ||
-- (at your option) any later version. | ||
-- | ||
-- This program is distributed in the hope that it will be useful, | ||
-- but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
-- GNU General Public License for more details. | ||
-- | ||
-- You should have received a copy of the GNU General Public License | ||
-- along with this program. If not, see http://www.gnu.org/licenses/. | ||
|
||
|
||
CREATE TABLE llx_website_account( | ||
-- BEGIN MODULEBUILDER FIELDS | ||
rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, | ||
login varchar(64) NOT NULL, | ||
pass_encoding varchar(24) NOT NULL, | ||
pass_crypted varchar(128), | ||
pass_temp varchar(128), -- temporary password when asked for forget password | ||
fk_soc integer, | ||
fk_website integer NOT NULL, | ||
note_private text, | ||
date_last_login datetime, | ||
date_previous_login datetime, | ||
date_creation datetime NOT NULL, | ||
tms timestamp NOT NULL, | ||
fk_user_creat integer NOT NULL, | ||
fk_user_modif integer, | ||
import_key varchar(14), | ||
status integer | ||
-- END MODULEBUILDER FIELDS | ||
) ENGINE=innodb; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters