Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-06 17:13:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'upstream/develop' into charges

Browse Source 
Conflicts:
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
This commit is contained in:
frederic34
2016-07-15 10:41:56 +02:00
parent f25ff0581c 74f28b3861
commit 2de3d4ec7b
4 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
View File

@@ -22,8 +22,15 @@
-- -- VMYSQL4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
ALTER TABLE llx_website ADD COLUMN virtualhost varchar(255) after fk_default_home;
ALTER TABLE llx_website ADD COLUMN virtualhost varchar(255) after fk_default_home;
ALTER TABLE llx_chargesociales ADD COLUMN fk_account integer after fk_type;
ALTER TABLE llx_chargesociales ADD COLUMN fk_mode_reglement integer after fk_account;
ALTER TABLE llx_ecm_files ADD COLUMN gen_or_uploaded varchar(12) after cover;
DROP TABLE llx_document_generator;
DROP TABLE llx_ecm_documents;

3
htdocs/install/mysql/tables/llx_ecm_files.sql
View File

@@ -27,7 +27,8 @@ CREATE TABLE llx_ecm_files
description text,
keywords text, -- list of keywords, separated with comma
cover text, -- is this file a file to use for a cover
extraparams varchar(255), -- for stock other parameters with json format
gen_or_uploaded varchar(12), -- 'generated' or 'uploaded'
extraparams varchar(255), -- for stocking other parameters with json format
date_c datetime,
date_m timestamp,
fk_user_c integer,