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

Merge branch 'develop' into new_user_hr_fields

Browse Source
This commit is contained in:
Laurent Destailleur
2019-04-11 18:27:58 +02:00
committed by GitHub
parent 0a0e29a089 41d30e8f82
commit fae2983c2a
2271 changed files with 115330 additions and 63849 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,7 @@ CREATE TABLE llx_emailcollector_emailcollector(
datelastresult datetime,
codelastresult varchar(16),
lastresult varchar(255),
datelastok datetime,
note_public text,
note_private text,
date_creation datetime NOT NULL,

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

@@ -19,7 +19,7 @@ CREATE TABLE llx_emailcollector_emailcollectorfilter(
rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
fk_emailcollector INTEGER NOT NULL,
type varchar(128) NOT NULL,
rulevalue varchar(255) NULL,
rulevalue varchar(128) NULL,
date_creation datetime NOT NULL,
tms timestamp NOT NULL,
fk_user_creat integer NOT NULL,

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

@@ -51,7 +51,7 @@ CREATE TABLE llx_expensereport_det
multicurrency_total_tva double(24,8) DEFAULT 0,
multicurrency_total_ttc double(24,8) DEFAULT 0,
fk_facture integer DEFAULT 0, -- ID of customer invoice line if expense is rebilled to a customer
fk_expensereport_line integer DEFAULT NULL, -- ID of ECM file that is source document of expense report
fk_ecm_files integer DEFAULT NULL, -- ID of ECM file that is source document of expense report
fk_code_ventilation integer DEFAULT 0,
rang integer DEFAULT 0, -- position of line
import_key varchar(14),

1
htdocs/install/mysql/tables/llx_product.key.sql
View File

@@ -30,6 +30,7 @@ ALTER TABLE llx_product ADD INDEX idx_product_seuil_stock_alerte (seuil_stock_al
ALTER TABLE llx_product ADD INDEX idx_product_fk_country (fk_country);
ALTER TABLE llx_product ADD INDEX idx_product_fk_user_author (fk_user_author);
ALTER TABLE llx_product ADD INDEX idx_product_fk_barcode_type (fk_barcode_type);
ALTER TABLE llx_product ADD INDEX idx_product_fk_project (fk_project);
ALTER TABLE llx_product ADD UNIQUE INDEX uk_product_barcode (barcode, fk_barcode_type, entity);
ALTER TABLE llx_product ADD CONSTRAINT fk_product_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid);

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

@@ -94,5 +94,6 @@ create table llx_product
fk_price_expression integer, -- Link to the rule for dynamic price calculation
desiredstock integer DEFAULT 0,
fk_unit integer DEFAULT NULL,
price_autogen tinyint DEFAULT 0
price_autogen tinyint DEFAULT 0,
fk_project integer DEFAULT NULL -- Used when product was generated by a project or is specifif to a project
)ENGINE=innodb;