Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop Conflicts: htdocs/install/mysql/migration/3.3.0-3.4.0.sql
This commit is contained in:
commit
e4ae70b5b2
@ -194,10 +194,8 @@ CREATE TABLE llx_cronjob
|
||||
|
||||
ALTER TABLE llx_societe MODIFY COLUMN zip varchar(25);
|
||||
|
||||
|
||||
ALTER TABLE llx_user ADD COLUMN address varchar(255);
|
||||
ALTER TABLE llx_user ADD COLUMN zip varchar(25);
|
||||
ALTER TABLE llx_user ADD COLUMN town varchar(50);
|
||||
ALTER TABLE llx_user ADD COLUMN fk_state integer DEFAULT 0; --
|
||||
ALTER TABLE llx_user ADD COLUMN fk_country integer DEFAULT 0;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user