Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch 'abb-14' of https://github.com/bafbes/dolibarr into bafbes-abb-14

Browse Source 
Conflicts:
	htdocs/langs/en_US/companies.lang
This commit is contained in:
Laurent Destailleur
2016-07-15 17:05:12 +02:00
parent 1b070babc8 23c0a0a64e
commit 9ba1ca5acb
41 changed files with 7175 additions and 6569 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,6 +22,9 @@
-- -- VMYSQL4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
ALTER TABLE llx_user DROP COLUMN phenix_login;
ALTER TABLE llx_user DROP COLUMN phenix_pass;
ALTER TABLE llx_societe ADD COLUMN fk_account integer;
ALTER TABLE llx_website ADD COLUMN virtualhost varchar(255) after fk_default_home;
@@ -31,5 +34,5 @@ ALTER TABLE llx_ecm_files ADD COLUMN gen_or_uploaded varchar(12) after cover;
DROP TABLE llx_document_generator;
DROP TABLE llx_ecm_documents;
ALTER TABLE llx_notify ADD COLUMN type_target varchar(16) NULL;

1
htdocs/install/mysql/tables/llx_notify.sql
View File

@@ -28,6 +28,7 @@ create table llx_notify
fk_contact integer NULL,
fk_user integer NULL,
type varchar(16) DEFAULT 'email',
type_target varchar(16) NULL, -- What type of target notification was sent to ? 'tocontactid', 'touserid', 'tofixedemail'
objet_type varchar(24) NOT NULL,
objet_id integer NOT NULL,
email varchar(255)