diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 861de271dabaccfd61a42941497aecc6f7ce15cb..6291790d008834e779bbe90fab88e6b79729e997 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -31,6 +31,7 @@ class BookKeeping
 {
 	var $db;
 	var $error;
+	var $errors;
 
 	var $id;
 	var $doc_date;
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 5448df14010f02961ceef18e3687cd38c3c09ddc..a4396624f86810be8c81c093d38cb223f14149ce 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -535,8 +535,7 @@ class ExtraFields
 		$array_name_label=array();
 
 		// For avoid conflicts with external modules
-		if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))
-			return $array_name_label;
+		if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return $array_name_label;
 
 		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable";
 		$sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
@@ -569,13 +568,13 @@ class ExtraFields
 					$this->attribute_alwayseditable[$tab->name]=$tab->alwayseditable;
 				}
 			}
-
-			return $array_name_label;
 		}
 		else
 		{
 			print dol_print_error($this->db);
 		}
+
+		return $array_name_label;
 	}
 
 
diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index 4083ba2f7b90c56a3f1bebb741a6d21ce746c84d..9b81f0ca78df38600e220b07ef7987feacf06a9e 100755
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -204,3 +204,13 @@ UPDATE llx_projet_task_time set task_datehour = task_date where task_datehour IS
 -- GRANT ALL ON *.* TO 'myuser'@'%';
 -- flush privileges;
 
+-- Fix type of product 2 does not exists
+update llx_propaldet set product_type = 1 where product_type = 2;
+update llx_commandedet set product_type = 1 where product_type = 2;
+update llx_facturedet set product_type = 1 where product_type = 2;
+--update llx_propaldet as d set d.product_type = 1 where d.fk_product = 22 and d.product_type = 0;
+--update llx_commandedet as d set d.product_type = 1 where d.fk_product = 22 and d.product_type = 0;
+--update llx_facturedet as d set d.product_type = 1 where d.fk_product = 22 and d.product_type = 0;
+
+
+