diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 62de18a4235269f18002e6a8c9da717f2c3160fc..1eaf0bc2709bc9613da5d55986687d7742f52ca2 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -1411,24 +1411,26 @@ if ($id > 0 || ! empty($ref))
 	 */
 	print '<table class="noborder" width="100%">';
 
-	// Milestone module
-	if ($conf->milestone->enabled)
+	// Hook of thirdparty module
+	if (! empty($hooks->objModules))
 	{
-		$lines = $propal->getLinesArray(1);
-
-		$milestone = new Milestone($db);
-		$milestone->getObjectMilestones($propal);
-		$sublines = $propal->getLinesArray(2);
-
-		if (! empty($milestone->lines))
+		foreach($hooks->objModules as $module)
 		{
-			print_title_list();
-			print_milestone_list($milestone, $sublines, $propal, $lines);
-		}
-		else if (! empty($lines) )
-		{
-			print_title_list();
-			print_lines_list($propal, $lines);
+			$lines = $propal->getLinesArray(1);
+			
+			$module->getObjectList($propal);
+			$sublines = $propal->getLinesArray(2);
+			
+			if (! empty($module->lines))
+			{
+				print_title_list();
+				$module->printObjectList($module, $sublines, $propal, $lines);
+			}
+			else if (! empty($lines) )
+			{
+				print_title_list();
+				print_lines_list($propal, $lines);
+			}
 		}
 	}
 	else
@@ -1461,11 +1463,14 @@ if ($id > 0 || ! empty($ref))
 				$propal->showAddPredefinedProductForm();
 			}
 			
-			// Add hook of other modules
-			if ($conf->milestone->enabled)
+			// Hook of thirdparty module
+			if (! empty($hooks->objModules))
 			{
-				$var=!$var;
-				formAddMilestone($propal);
+				foreach($hooks->objModules as $module)
+				{
+					$var=!$var;
+					$module->formAddObject($propal);
+				}
 			}
 		}
 	}
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index cd0caa1e33a67baa624606a3efa45cdc1f838de7..38a660c53d72ca3df6e7c1e0b9b9fec28419b44e 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1161,10 +1161,12 @@ class CommonObject
 				{
 					require_once(DOL_DOCUMENT_ROOT.'/'.$module.'/class/'.$module.'.class.php');
 				}
+				/*
 				if (file_exists(DOL_DOCUMENT_ROOT.'/'.$module.'/lib/'.$module.'.lib.php'))
 				{
 					require_once(DOL_DOCUMENT_ROOT.'/'.$module.'/lib/'.$module.'.lib.php');
 				}
+				*/
 				
 				$classname = ucfirst($module);
 				$this->objModules[] = new $classname($this->db);