Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9

Dolibarr · Jun 3, 2016 · 609cc1d · 609cc1d
2 parents 9c3365a + 6cef3b8
commit 609cc1d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -610,3 +610,4 @@ INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (14
 
 -- VMYSQL4.1 ALTER TABLE llx_c_type_resource CHANGE COLUMN rowid rowid integer NOT NULL AUTO_INCREMENT;
 
+ALTER TABLE llx_import_model MODIFY COLUMN type varchar(50);
diff --git a/htdocs/install/mysql/tables/llx_import_model.sql b/htdocs/install/mysql/tables/llx_import_model.sql
@@ -23,6 +23,6 @@ create table llx_import_model
   	rowid         integer AUTO_INCREMENT PRIMARY KEY,
 	fk_user		  integer DEFAULT 0 NOT NULL,
   	label         varchar(50) NOT NULL,
-  	type		  varchar(20) NOT NULL,
+  	type		  varchar(50) NOT NULL,
   	field         text NOT NULL
 )ENGINE=innodb;