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

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_element_tag_table

Browse Source
This commit is contained in:
Maxime Kohlhaas
2021-10-31 09:19:48 +01:00
parent 75f579c3ad 0017c15974
commit 9bc419f2dd
555 changed files with 4871 additions and 3846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/install/mysql/migration/13.0.0-14.0.0.sql
View File

@@ -627,3 +627,5 @@ CREATE TABLE llx_onlinesignature
ALTER TABLE llx_facture_fourn CHANGE COLUMN fk_mode_transport fk_transport_mode integer;
ALTER TABLE llx_c_socialnetworks DROP INDEX idx_c_socialnetworks_code;
ALTER TABLE llx_c_socialnetworks ADD UNIQUE INDEX idx_c_socialnetworks_code_entity (code, entity);

52
htdocs/install/mysql/migration/14.0.0-15.0.0.sql
View File

@@ -35,6 +35,7 @@
-- VMYSQL4.3 ALTER TABLE llx_partnership MODIFY COLUMN date_partnership_end date NULL;
-- VPGSQL8.2 ALTER TABLE llx_partnership ALTER COLUMN date_partnership_end DROP NOT NULL;
ALTER TABLE llx_accounting_bookkeeping ADD COLUMN date_export datetime DEFAULT NULL;
ALTER TABLE llx_eventorganization_conferenceorboothattendee ADD COLUMN fk_project integer NOT NULL;
ALTER TABLE llx_eventorganization_conferenceorboothattendee ADD COLUMN fk_invoice integer NULL;
@@ -378,3 +379,54 @@ ALTER TABLE llx_societe_perentity ADD COLUMN accountancy_code_customer varchar(2
ALTER TABLE llx_societe_perentity ADD COLUMN accountancy_code_supplier varchar(24) AFTER accountancy_code_customer; -- equivalent to code_compta_supplier in llx_societe
ALTER TABLE llx_projet_task ADD COLUMN budget_amount double(24,8) AFTER priority;
-- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT 'box_graph_ticket_by_severity.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_graph_ticket_by_severity.php' AND entity = 1);
-- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT 'box_graph_nb_ticket_last_x_days.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_graph_nb_ticket_last_x_days.php' AND entity = 1);
-- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT 'box_graph_nb_tickets_type.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_graph_nb_tickets_type.php' AND entity = 1);
-- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT 'box_graph_new_vs_close_ticket.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_graph_new_vs_close_ticket.php' AND entity = 1);
ALTER TABLE llx_user DROP COLUMN jabberid;
ALTER TABLE llx_user DROP COLUMN skype;
ALTER TABLE llx_user DROP COLUMN twitter;
ALTER TABLE llx_user DROP COLUMN facebook;
ALTER TABLE llx_user DROP COLUMN linkedin;
ALTER TABLE llx_user DROP COLUMN instagram;
ALTER TABLE llx_user DROP COLUMN snapchat;
ALTER TABLE llx_user DROP COLUMN googleplus;
ALTER TABLE llx_user DROP COLUMN youtube;
ALTER TABLE llx_user DROP COLUMN whatsapp;
ALTER TABLE llx_adherent DROP COLUMN jabberid;
ALTER TABLE llx_adherent DROP COLUMN skype;
ALTER TABLE llx_adherent DROP COLUMN twitter;
ALTER TABLE llx_adherent DROP COLUMN facebook;
ALTER TABLE llx_adherent DROP COLUMN linkedin;
ALTER TABLE llx_adherent DROP COLUMN instagram;
ALTER TABLE llx_adherent DROP COLUMN snapchat;
ALTER TABLE llx_adherent DROP COLUMN googleplus;
ALTER TABLE llx_adherent DROP COLUMN youtube;
ALTER TABLE llx_adherent DROP COLUMN whatsapp;
ALTER TABLE llx_societe DROP COLUMN jabberid;
ALTER TABLE llx_societe DROP COLUMN skype;
ALTER TABLE llx_societe DROP COLUMN twitter;
ALTER TABLE llx_societe DROP COLUMN facebook;
ALTER TABLE llx_societe DROP COLUMN linkedin;
ALTER TABLE llx_societe DROP COLUMN instagram;
ALTER TABLE llx_societe DROP COLUMN snapchat;
ALTER TABLE llx_societe DROP COLUMN googleplus;
ALTER TABLE llx_societe DROP COLUMN youtube;
ALTER TABLE llx_societe DROP COLUMN whatsapp;
ALTER TABLE llx_socpeople DROP COLUMN jabberid;
ALTER TABLE llx_socpeople DROP COLUMN skype;
ALTER TABLE llx_socpeople DROP COLUMN twitter;
ALTER TABLE llx_socpeople DROP COLUMN facebook;
ALTER TABLE llx_socpeople DROP COLUMN linkedin;
ALTER TABLE llx_socpeople DROP COLUMN instagram;
ALTER TABLE llx_socpeople DROP COLUMN snapchat;
ALTER TABLE llx_socpeople DROP COLUMN googleplus;
ALTER TABLE llx_socpeople DROP COLUMN youtube;
ALTER TABLE llx_socpeople DROP COLUMN whatsapp;

18
htdocs/install/mysql/tables/llx_adherent.sql
View File

@@ -51,15 +51,15 @@ create table llx_adherent
url varchar(255) NULL,
socialnetworks text DEFAULT NULL, -- json with socialnetworks
skype varchar(255), -- deprecated
twitter varchar(255), -- deprecated
facebook varchar(255), -- deprecated
linkedin varchar(255), -- deprecated
instagram varchar(255), -- deprecated
snapchat varchar(255), -- deprecated
googleplus varchar(255), -- deprecated
youtube varchar(255), -- deprecated
whatsapp varchar(255), -- deprecated
--skype varchar(255), -- deprecated
--twitter varchar(255), -- deprecated
--facebook varchar(255), -- deprecated
--linkedin varchar(255), -- deprecated
--instagram varchar(255), -- deprecated
--snapchat varchar(255), -- deprecated
--googleplus varchar(255), -- deprecated
--youtube varchar(255), -- deprecated
--whatsapp varchar(255), -- deprecated
phone varchar(30),
phone_perso varchar(30),

2
htdocs/install/mysql/tables/llx_c_socialnetworks.key.sql
View File

@@ -16,4 +16,4 @@
-- ========================================================================
ALTER TABLE llx_c_socialnetworks ADD UNIQUE INDEX idx_c_socialnetworks_code (code);
ALTER TABLE llx_c_socialnetworks ADD UNIQUE INDEX idx_c_socialnetworks_code_entity (entity, code);

18
htdocs/install/mysql/tables/llx_societe.sql
View File

@@ -52,15 +52,15 @@ create table llx_societe
email varchar(128), --
socialnetworks text DEFAULT NULL, -- json with socialnetworks
skype varchar(255), -- deprecated
twitter varchar(255), -- deprecated
facebook varchar(255), -- deprecated
linkedin varchar(255), -- deprecated
instagram varchar(255), -- deprecated
snapchat varchar(255), -- deprecated
googleplus varchar(255), -- deprecated
youtube varchar(255), -- deprecated
whatsapp varchar(255), -- deprecated
--skype varchar(255), -- deprecated
--twitter varchar(255), -- deprecated
--facebook varchar(255), -- deprecated
--linkedin varchar(255), -- deprecated
--instagram varchar(255), -- deprecated
--snapchat varchar(255), -- deprecated
--googleplus varchar(255), -- deprecated
--youtube varchar(255), -- deprecated
--whatsapp varchar(255), -- deprecated
fk_effectif integer DEFAULT 0, --
fk_typent integer DEFAULT NULL, -- type ent

20
htdocs/install/mysql/tables/llx_socpeople.sql
View File

@@ -44,16 +44,16 @@ create table llx_socpeople
email varchar(255),
socialnetworks text DEFAULT NULL, -- json with socialnetworks
jabberid varchar(255),
skype varchar(255),
twitter varchar(255), --
facebook varchar(255), --
linkedin varchar(255), --
instagram varchar(255), --
snapchat varchar(255), --
googleplus varchar(255), --
youtube varchar(255), --
whatsapp varchar(255), --
--jabberid varchar(255),
--skype varchar(255),
--twitter varchar(255), --
--facebook varchar(255), --
--linkedin varchar(255), --
--instagram varchar(255), --
--snapchat varchar(255), --
--googleplus varchar(255), --
--youtube varchar(255), --
--whatsapp varchar(255), --
photo varchar(255),
no_email smallint NOT NULL DEFAULT 0, -- deprecated. Use table llx_mailing_unsubscribe instead