From db0f278702083217168c027f73ac73a04e70d88b Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Fri, 6 Aug 2010 17:01:11 +0000
Subject: [PATCH] Works on capability to hook a thirdparty module.
---
htdocs/comm/propal.php | 45 +++++++++++++-----------
htdocs/core/class/commonobject.class.php | 2 ++
2 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 62de18a4235..1eaf0bc2709 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 cd0caa1e33a..38a660c53d7 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);
--
GitLab