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_deposit_payment_terms

Browse Source
This commit is contained in:
Marc de Lima Lucio
2022-03-25 16:14:53 +01:00
parent 4efcbe8799 4d91e448ce
commit cbba7d7d5f
276 changed files with 8464 additions and 4932 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,10 +19,12 @@
--
-- ===================================================================
--
-- statut
-- -1 : brouillon
-- 0 : resilie
-- 1 : valide
-- state / statut
-- -2 : excluded / exclu
-- -1 : draft / brouillon
-- 0 : canceled / resilie
-- 1 : valid / valide
--
create table llx_adherent
(
@@ -39,7 +41,7 @@ create table llx_adherent
pass varchar(50), -- password
pass_crypted varchar(128),
fk_adherent_type integer NOT NULL,
morphy varchar(3) NOT NULL, -- personne morale / personne physique
morphy varchar(3) NOT NULL, -- EN: legal entity / natural person FR: personne morale / personne physique
societe varchar(128), -- company name (should be same length than societe.name). No more used.
fk_soc integer NULL, -- Link to third party linked to member
address text,
@@ -64,20 +66,20 @@ create table llx_adherent
phone varchar(30),
phone_perso varchar(30),
phone_mobile varchar(30),
birth date, -- birthday
photo varchar(255), -- filename or url of photo
birth date, -- birthday
photo varchar(255), -- filename or url of photo
statut smallint NOT NULL DEFAULT 0,
public smallint NOT NULL DEFAULT 0, -- certain champ de la fiche sont ils public ou pas ?
datefin datetime, -- date de fin de validite de la cotisation
public smallint NOT NULL DEFAULT 0, -- certain champ de la fiche sont ils public ou pas ?
datefin datetime, -- end date of validity of the contribution / date de fin de validite de la cotisation
note_private text DEFAULT NULL,
note_public text DEFAULT NULL,
model_pdf varchar(255),
datevalid datetime, -- date de validation
datec datetime, -- date de creation
datevalid datetime, -- date of validation
datec datetime, -- date of creation
tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, -- last modification date
fk_user_author integer, -- can be null because member can be create by a guest
fk_user_author integer, -- can be null because member can be create by a guest
fk_user_mod integer,
fk_user_valid integer,
canvas varchar(32), -- type of canvas if used (null by default)
import_key varchar(14) -- Import key
canvas varchar(32), -- type of canvas if used (null by default)
import_key varchar(14) -- Import key
)ENGINE=innodb;

2
htdocs/install/mysql/tables/llx_c_availability.sql
View File

@@ -23,6 +23,8 @@ create table llx_c_availability
rowid integer AUTO_INCREMENT PRIMARY KEY,
code varchar(30) NOT NULL,
label varchar(128) NOT NULL,
type_duration varchar(1),
qty real,
active tinyint DEFAULT 1 NOT NULL,
position integer NOT NULL DEFAULT 0
)ENGINE=innodb;

21
htdocs/install/mysql/tables/llx_c_hrm_public_holiday.sql
View File

@@ -18,14 +18,15 @@
create table llx_c_hrm_public_holiday
(
id integer AUTO_INCREMENT PRIMARY KEY,
entity integer DEFAULT 0 NOT NULL, -- multi company id, 0 = all
fk_country integer,
code varchar(62),
dayrule varchar(64) DEFAULT '', -- 'easter', 'eastermonday', ...
day integer,
month integer,
year integer, -- 0 for all years
active integer DEFAULT 1,
import_key varchar(14)
id integer AUTO_INCREMENT PRIMARY KEY,
entity integer DEFAULT 0 NOT NULL, -- multi company id, 0 = all
fk_country integer,
fk_departement integer,
code varchar(62),
dayrule varchar(64) DEFAULT '', -- 'easter', 'eastermonday', ...
day integer,
month integer,
year integer, -- 0 for all years
active integer DEFAULT 1,
import_key varchar(14)
)ENGINE=innodb;

20
htdocs/install/mysql/tables/llx_chargesociales.key.sql Normal file
View File

@@ -0,0 +1,20 @@
-- ===================================================================
-- 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_chargesociales ADD INDEX idx_chargesociales (ref);

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

@@ -3,6 +3,7 @@
-- Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com>
-- Copyright (C) 2017 Alexandre Spangaro <aspangaro@open-dsi.fr>
-- Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
-- 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
@@ -40,6 +41,8 @@ create table llx_chargesociales
paye smallint default 0 NOT NULL,
periode date,
fk_projet integer DEFAULT NULL,
note_private text,
note_public text,
import_key varchar(14)
)ENGINE=innodb;

9
htdocs/install/mysql/tables/llx_holiday.sql
View File

@@ -31,10 +31,11 @@ description VARCHAR( 255 ) NOT NULL,
date_debut DATE NOT NULL,
date_fin DATE NOT NULL,
halfday integer DEFAULT 0, -- 0=start morning and end afternoon, -1=start afternoon end afternoon, 1=start morning and end morning, 2=start afternoon and end morning
statut integer NOT NULL DEFAULT '1',
fk_validator integer NOT NULL, -- who should approve
date_valid DATETIME DEFAULT NULL, -- date approval (both date valid and date_approval)
fk_user_valid integer DEFAULT NULL, -- user approval (both user valid and user that approved)
nb_open_day double(24,8) DEFAULT NULL, -- denormalized number of open days of holiday. Not always set. More reliable when re-calculated with num_open_days(date_debut, date_fin, halfday).
statut integer NOT NULL DEFAULT 1, -- status of leave request
fk_validator integer NOT NULL, -- who should approve the leave
date_valid DATETIME DEFAULT NULL, -- date approval (currently both date valid and date_approval)
fk_user_valid integer DEFAULT NULL, -- user approval (currently both user valid and user that approved)
date_approve DATETIME DEFAULT NULL, -- date approval (not used yet)
fk_user_approve integer DEFAULT NULL, -- user approval (not used yet)
date_refuse DATETIME DEFAULT NULL,

3
htdocs/install/mysql/tables/llx_partnership-partnership.key.sql
View File

@@ -19,3 +19,6 @@
ALTER TABLE llx_partnership ADD INDEX idx_partnership_entity (entity);
ALTER TABLE llx_partnership ADD UNIQUE INDEX uk_partnership_ref (ref, entity);
ALTER TABLE llx_partnership ADD UNIQUE INDEX uk_fk_type_fk_soc (fk_type, fk_soc, date_partnership_start);
ALTER TABLE llx_partnership ADD UNIQUE INDEX uk_fk_type_fk_member (fk_type, fk_member, date_partnership_start);

2
htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
View File

@@ -50,7 +50,7 @@ create table llx_product_fournisseur_price
import_key varchar(14), -- Import key
delivery_time_days integer,
supplier_reputation varchar(10),
packaging varchar(64) DEFAULT NULL,
packaging real DEFAULT NULL,
fk_multicurrency integer,
multicurrency_code varchar(3),
multicurrency_tx double(24,8) DEFAULT 1,