Merge pull request #998 from FHenry/develop

Develop

htdocs/comm/propal/list.php

@@ -77,7 +77,7 @@ $result = restrictedArea($user, $module, $objectid, $dbtable);
 
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('propalcard'));
+$hookmanager->initHooks(array('propallist'));
 
 
 
@@ -85,6 +85,10 @@ $hookmanager->initHooks(array('propalcard'));
  * Actions
  */
 
+
+$parameters=array('socid'=>$socid);
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
 // Do we click on purge search criteria ?
 if (GETPOST("button_removefilter_x"))
 {

htdocs/commande/liste.php

@@ -67,10 +67,16 @@ $limit = $conf->liste_limit;
 $viewstatut=GETPOST('viewstatut');
 
 
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('orderlist'));
+
 /*
  * Actions
  */
 
+$parameters=array('socid'=>$socid);
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hook
+
 // Do we click on purge search criteria ?
 if (GETPOST("button_removefilter_x"))
 {

htdocs/compta/facture/list.php

@@ -98,7 +98,7 @@ $usehm=(! empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MA
 $object=new Facture($db);
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('invoicecard'));
+$hookmanager->initHooks(array('invoicelist'));
 
 $now=dol_now();
 

htdocs/core/lib/functions.lib.php

@@ -223,10 +223,9 @@ function dol_getprefix()
 
 /**
  *	Make an include_once using default root and alternate root if it fails.
- *	WARNING: In most cases, you should not use this function:
  *  To link to a core file, use include(DOL_DOCUMENT_ROOT.'/pathtofile')
  *  To link to a module file from a module file, use include './mymodulefile';
- *  To link to a module file from a core file, then this function can be used
+ *  To link to a module file from a core file, then this function can be used (call by hook / trigger / speciales pages)
  *
  * 	@param	string	$relpath	Relative path to file (Ie: mydir/myfile, ../myfile, ...)
  * 	@param	string	$classname	Class name