Merge remote-tracking branch 'upstream/develop' into 10.0_linkedin

This commit is contained in:
Alexandre SPANGARO
2019-02-25 09:12:04 +01:00
406 changed files with 6901 additions and 5116 deletions

View File

@@ -100,5 +100,6 @@ create table llx_user
import_key varchar(14), -- import key
default_range integer,
default_c_exp_tax_cat integer
default_c_exp_tax_cat integer,
fk_warehouse integer
)ENGINE=innodb;