lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #998 from FHenry/develop

Browse Source 
Develop
This commit is contained in:
Laurent Destailleur 2013-05-28 15:23:29 -07:00
commit 9ab8f4c6a3
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/comm/propal/list.php
View File

@ -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 // 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 * 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 ? // Do we click on purge search criteria ?
if (GETPOST("button_removefilter_x")) if (GETPOST("button_removefilter_x"))
{ {

6
htdocs/commande/liste.php
View File

@ -67,10 +67,16 @@ $limit = $conf->liste_limit;
$viewstatut=GETPOST('viewstatut'); $viewstatut=GETPOST('viewstatut');
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
$hookmanager->initHooks(array('orderlist'));
/* /*
* Actions * 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 ? // Do we click on purge search criteria ?
if (GETPOST("button_removefilter_x")) if (GETPOST("button_removefilter_x"))
{ {

2
htdocs/compta/facture/list.php
View File

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

3
htdocs/core/lib/functions.lib.php
View File

@ -223,10 +223,9 @@ function dol_getprefix()
/** /**
* Make an include_once using default root and alternate root if it fails. * 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 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 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 $relpath Relative path to file (Ie: mydir/myfile, ../myfile, ...)
* @param string $classname Class name * @param string $classname Class name