Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur
2018-10-30 14:48:09 +01:00
parent 68f6ebd0ff 0f850cfa3e
commit 4a71374cf7
6 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,16 +115,16 @@ function getDoliDBInstance($type, $host, $user, $pass, $name, $port)
* 'c_paiement', 'c_payment_term', ...
* @param int $shared 0=Return id of current entity only,
* 1=Return id of current entity + shared entities (default)
* @param int $forceentity Entity id
* @param object $currentobject Current object if needed
* @return mixed Entity id(s) to use
*/
function getEntity($element, $shared=1, $forceentity=null)
function getEntity($element, $shared=1, $currentobject=null)
{
global $conf, $mc;
if (is_object($mc))
{
return $mc->getEntity($element, $shared, $forceentity);
return $mc->getEntity($element, $shared, $currentobject);
}
else
{