diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql index 946b57810786227dd86b5bdb10e5ea26a8d3b316..0c44708c6db2a20e17815641aa1bb0f8a0402c27 100755 --- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql +++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql @@ -1177,3 +1177,5 @@ ALTER TABLE llx_extrafields ADD COLUMN list integer DEFAULT 0 after perms; -- IVORY COST (id country=21) insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values (211, 21, '0','0',0,0,0,0,'IVA Rate 0',1); insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values (212, 21, '18','0',7.5,2,0,0,'IVA standard rate',1); + +ALTER TABLE llx_livraison MODIFY COLUMN date_delivery DATETIME NULL DEFAULT NULL; diff --git a/htdocs/install/mysql/tables/llx_livraison.sql b/htdocs/install/mysql/tables/llx_livraison.sql index ed97eb33f947df9996b9b9af95ab991a311ab475..c999cfdb3c2be864b5402366ef1dbfb825ff6adf 100644 --- a/htdocs/install/mysql/tables/llx_livraison.sql +++ b/htdocs/install/mysql/tables/llx_livraison.sql @@ -33,7 +33,7 @@ create table llx_livraison fk_user_author integer, -- createur du bon de livraison date_valid datetime, -- date de validation fk_user_valid integer, -- valideur du bon de livraison - date_delivery date DEFAULT NULL, -- delivery date + date_delivery datetime DEFAULT NULL, -- delivery date fk_address integer, -- delivery address (deprecated) fk_statut smallint DEFAULT 0, total_ht double(24,8) DEFAULT 0,