lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX : v7 sql error on init database

Browse Source
This commit is contained in:
Alexandre SPANGARO 2017-12-10 08:02:57 +01:00
parent 472d7b591e
commit ff9c714f88
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.sql
View File

@ -50,7 +50,7 @@ CREATE TABLE llx_accounting_bookkeeping_tmp
journal_label varchar(255), -- FEC:JournalLib journal_label varchar(255), -- FEC:JournalLib
piece_num integer NOT NULL, -- FEC:EcritureNum piece_num integer NOT NULL, -- FEC:EcritureNum
validated tinyint DEFAULT 0 NOT NULL, -- | 0 line not validated / 1 line validated (No deleting / No modification) validated tinyint DEFAULT 0 NOT NULL, -- | 0 line not validated / 1 line validated (No deleting / No modification)
date_validated datetime -- FEC:ValidDate date_validated datetime, -- FEC:ValidDate
import_key varchar(14), import_key varchar(14),
extraparams varchar(255) -- for other parameters with json format extraparams varchar(255) -- for other parameters with json format
) ENGINE=innodb; ) ENGINE=innodb;

2
htdocs/install/mysql/tables/llx_blockedlog.sql
View File

@ -26,7 +26,7 @@ CREATE TABLE llx_blockedlog
amounts double(24,8) NOT NULL, amounts double(24,8) NOT NULL,
element varchar(50), element varchar(50),
fk_user integer, fk_user integer,
user_fullname varchar(255); user_fullname varchar(255),
fk_object integer, fk_object integer,
ref_object varchar(255), ref_object varchar(255),
date_object datetime, date_object datetime,

34
htdocs/install/mysql/tables/llx_user.sql
View File

@ -26,7 +26,7 @@ create table llx_user
ref_ext varchar(50), -- reference into an external system (not used by dolibarr) ref_ext varchar(50), -- reference into an external system (not used by dolibarr)
ref_int varchar(50), -- reference into an internal system (deprecated) ref_int varchar(50), -- reference into an internal system (deprecated)
employee tinyint DEFAULT 1, -- 1 if user is an employee employee tinyint DEFAULT 1, -- 1 if user is an employee
fk_establishment integer DEFAULT 0, fk_establishment integer DEFAULT 0,
datec datetime, datec datetime,
@ -34,21 +34,21 @@ create table llx_user
fk_user_creat integer, fk_user_creat integer,
fk_user_modif integer, fk_user_modif integer,
login varchar(50) NOT NULL, login varchar(50) NOT NULL,
pass_encoding varchar(24); pass_encoding varchar(24),
pass varchar(128), pass varchar(128),
pass_crypted varchar(128), pass_crypted varchar(128),
pass_temp varchar(128), -- temporary password when asked for forget password pass_temp varchar(128), -- temporary password when asked for forget password
api_key varchar(128), -- key to use REST API by this user api_key varchar(128), -- key to use REST API by this user
gender varchar(10), gender varchar(10),
civility varchar(6), civility varchar(6),
lastname varchar(50), lastname varchar(50),
firstname varchar(50), firstname varchar(50),
address varchar(255), -- user personal address address varchar(255), -- user personal address
zip varchar(25), -- zipcode zip varchar(25), -- zipcode
town varchar(50), -- town town varchar(50), -- town
fk_state integer DEFAULT 0, -- fk_state integer DEFAULT 0,
fk_country integer DEFAULT 0, -- fk_country integer DEFAULT 0,
birth date, -- birthday birth date, -- birthday
job varchar(128), job varchar(128),
skype varchar(255), skype varchar(255),
office_phone varchar(20), office_phone varchar(20),
@ -62,7 +62,7 @@ create table llx_user
fk_soc integer, fk_soc integer,
fk_socpeople integer, fk_socpeople integer,
fk_member integer, fk_member integer,
fk_user integer, -- Hierarchic parent fk_user integer, -- Hierarchic parent
note_public text, note_public text,
note text DEFAULT NULL, note text DEFAULT NULL,
model_pdf varchar(255) DEFAULT NULL, model_pdf varchar(255) DEFAULT NULL,
@ -72,22 +72,22 @@ create table llx_user
ldap_sid varchar(255) DEFAULT NULL, ldap_sid varchar(255) DEFAULT NULL,
openid varchar(255), openid varchar(255),
statut tinyint DEFAULT 1, statut tinyint DEFAULT 1,
photo varchar(255), -- filename or url of photo photo varchar(255), -- filename or url of photo
lang varchar(6), lang varchar(6),
color varchar(6), color varchar(6),
barcode varchar(255) DEFAULT NULL, barcode varchar(255) DEFAULT NULL,
fk_barcode_type integer DEFAULT 0, fk_barcode_type integer DEFAULT 0,
accountancy_code varchar(32) NULL, accountancy_code varchar(32) NULL,
nb_holiday integer DEFAULT 0, nb_holiday integer DEFAULT 0,
thm double(24,8), thm double(24,8),
tjm double(24,8), tjm double(24,8),
salary double(24,8), -- denormalized value coming from llx_user_employment salary double(24,8), -- denormalized value coming from llx_user_employment
salaryextra double(24,8), -- denormalized value coming from llx_user_employment salaryextra double(24,8), -- denormalized value coming from llx_user_employment
dateemployment date, -- denormalized value coming from llx_user_employment dateemployment date, -- denormalized value coming from llx_user_employment
weeklyhours double(16,8), -- denormalized value coming from llx_user_employment weeklyhours double(16,8), -- denormalized value coming from llx_user_employment
import_key varchar(14), -- import key import_key varchar(14), -- import key
default_range integer, default_range integer,
default_c_exp_tax_cat integer default_c_exp_tax_cat integer
)ENGINE=innodb; )ENGINE=innodb;