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

htdocs/install/mysql/tables/llx_bom_bomline.sql

@@ -23,6 +23,6 @@ CREATE TABLE llx_bom_bomline(
 	import_key varchar(14), 
 	qty double(24,8) NOT NULL, 
 	efficiency double(8,4) NOT NULL DEFAULT 1,
-	rank integer NOT NULL
+	position integer NOT NULL
 	-- END MODULEBUILDER FIELDS
 ) ENGINE=innodb;