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

htdocs/install/mysql/migration/14.0.0-15.0.0.sql

@@ -41,6 +41,7 @@
 ALTER TABLE llx_emailcollector_emailcollectoraction MODIFY COLUMN actionparam TEXT;
 
 ALTER TABLE llx_knowledgemanagement_knowledgerecord ADD lang varchar(6);
+ALTER TABLE llx_knowledgemanagement_knowledgerecord ADD COLUMN entity integer DEFAULT 1;
 
 CREATE TABLE llx_categorie_ticket
 (
@@ -69,4 +70,3 @@ DELETE FROM llx_menu WHERE type = 'top' AND module = 'cashdesk' AND mainmenu = '
 
 
 INSERT INTO llx_c_action_trigger (code, label, description, elementtype, rang) values ('MEMBER_EXCLUDE', 'Member excluded', 'Executed when a member is excluded', 'member', 27);
-

htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord.sql

@@ -16,7 +16,8 @@
 
 CREATE TABLE llx_knowledgemanagement_knowledgerecord(
 	-- BEGIN MODULEBUILDER FIELDS
-	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, 
+	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+	entity integer DEFAULT 1 NOT NULL,  -- multi company id
 	ref varchar(128) NOT NULL, 
 	date_creation datetime NOT NULL, 
 	tms timestamp, 

htdocs/knowledgemanagement/class/knowledgerecord.class.php

@@ -50,7 +50,7 @@ class KnowledgeRecord extends CommonObject
 	 * @var int  Does this object support multicompany module ?
 	 * 0=No test on entity, 1=Test with field entity, 'field@table'=Test with link by field@table
 	 */
-	public $ismultientitymanaged = 0;
+	public $ismultientitymanaged = 1;
 
 	/**
 	 * @var int  Does object support extrafields ? 0=No, 1=Yes