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

Merge branch 'develop' into develop#5

Browse Source
This commit is contained in:
Hystepik
2022-09-12 10:16:31 +02:00
committed by GitHub
parent f22744210e 605db7d792
commit 56a0044974
907 changed files with 3444 additions and 1249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
htdocs/install/mysql/migration/16.0.0-17.0.0.sql
View File

@@ -149,4 +149,26 @@ UPDATE llx_c_effectif SET code='EF101-500', libelle='101 - 500' WHERE code='EF10
ALTER TABLE llx_rights_def ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
ALTER TABLE llx_establishment ADD COLUMN label varchar(255) NOT NULL AFTER entity;
ALTER TABLE llx_establishment ADD COLUMN label varchar(255) NOT NULL AFTER entity;
ALTER TABLE llx_don ADD UNIQUE INDEX idx_don_uk_ref (ref, entity);
ALTER TABLE llx_don ADD INDEX idx_don_fk_soc (fk_soc);
ALTER TABLE llx_don ADD INDEX idx_don_fk_project (fk_projet);
ALTER TABLE llx_don ADD INDEX idx_don_fk_user_author (fk_user_author);
ALTER TABLE llx_don ADD INDEX idx_don_fk_user_valid (fk_user_valid);
ALTER TABLE llx_commande ADD COLUMN revenuestamp double(24,8) DEFAULT 0 after localtax2;
create table llx_element_categorie
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
fk_categorie integer NOT NULL,
fk_element integer NOT NULL,
import_key varchar(14)
)ENGINE=innodb;
ALTER TABLE llx_element_categorie ADD UNIQUE INDEX idx_element_categorie_idx (fk_element, fk_categorie);
ALTER TABLE llx_element_categorie ADD CONSTRAINT fk_element_categorie_fk_categorie FOREIGN KEY (fk_categorie) REFERENCES llx_fk_categorie(rowid);

7
htdocs/install/mysql/tables/llx_commande.sql
View File

@@ -47,11 +47,14 @@ create table llx_commande
remise_percent real default 0,
remise_absolue real default 0,
remise real default 0,
total_tva double(24,8) default 0,
localtax1 double(24,8) default 0, -- total localtax1
localtax2 double(24,8) default 0, -- total localtax2
localtax1 double(24,8) default 0, -- total localtax1
localtax2 double(24,8) default 0, -- total localtax2
revenuestamp double(24,8) DEFAULT 0, -- amount total revenuestamp (usefull for proforma that must match invoice)
total_ht double(24,8) default 0,
total_ttc double(24,8) default 0,
note_private text,
note_public text,
model_pdf varchar(255),

29
htdocs/install/mysql/tables/llx_don-don.key.sql Normal file
View File

@@ -0,0 +1,29 @@
-- ===================================================================
-- Copyright (C) 2022 Laurent Destailleur <eldy@users.sourceforge.net>
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; either version 3 of the License, or
-- (at your option) any later version.
--
-- This program is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- GNU General Public License for more details.
--
-- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <https://www.gnu.org/licenses/>.
--
-- ===================================================================
ALTER TABLE llx_don ADD UNIQUE INDEX idx_don_uk_ref (ref, entity);
ALTER TABLE llx_don ADD INDEX idx_don_fk_soc (fk_soc);
ALTER TABLE llx_don ADD INDEX idx_don_fk_project (fk_project);
ALTER TABLE llx_don ADD INDEX idx_don_fk_user_author (fk_user_author);
ALTER TABLE llx_don ADD INDEX idx_don_fk_user_valid (fk_user_valid);
--ALTER TABLE llx_don ADD CONSTRAINT fk_don_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
--ALTER TABLE llx_don ADD CONSTRAINT fk_don_fk_user_author FOREIGN KEY (fk_user_author) REFERENCES llx_user (rowid);
--ALTER TABLE llx_don ADD CONSTRAINT fk_don_fk_user_valid FOREIGN KEY (fk_user_valid) REFERENCES llx_user (rowid);

6
htdocs/install/mysql/tables/llx_element_categorie.key.sql
View File

@@ -17,6 +17,6 @@
-- ============================================================================
ALTER TABLE llx_element_categorie ADD UNIQUE INDEX idx_element_categorie_idx1 (fk_element, fk_categorie);
ALTER TABLE llx_element_contact ADD CONSTRAINT fk_element_categorie_fk_categorie FOREIGN KEY (fk_categorie) REFERENCES llx_fk_categorie(rowid);
ALTER TABLE llx_element_categorie ADD UNIQUE INDEX idx_element_categorie_idx (fk_element, fk_categorie);
ALTER TABLE llx_element_categorie ADD CONSTRAINT fk_element_categorie_fk_categorie FOREIGN KEY (fk_categorie) REFERENCES llx_fk_categorie(rowid);