From 7223495ac26ec60eebd9276af3c088b3a11476c7 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sat, 18 Apr 2015 04:21:16 +0200
Subject: [PATCH] Fix : date_delivery was not a datetime

---
 htdocs/install/mysql/migration/3.6.0-3.7.0.sql | 2 ++
 htdocs/install/mysql/tables/llx_livraison.sql  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

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 b17a190f826..0c055fc5aea 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
@@ -1173,3 +1173,5 @@ ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN fk_commandefourndet INT
 -- 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;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_livraison.sql b/htdocs/install/mysql/tables/llx_livraison.sql
index 486212158aa..4cf0431a39a 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,
-- 
GitLab