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

Finished new module to manage expense reports !

Browse Source 
Fix export to support corectly multicompany
This commit is contained in:
Laurent Destailleur
2015-02-22 13:16:49 +01:00
parent 6d1324b463
commit 2bc6ac4671
31 changed files with 1189 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,13 +95,13 @@ function getDoliDBInstance($type, $host, $user, $pass, $name, $port)
}
/**
* Get entity to use
* Get list of entity id to use
*
* @param string $element Current element
* @param int $shared 1=Return shared entities
* @param int $shared 0=Return id of entity, 1=Return id entity + shared entities
* @return mixed Entity id(s) to use
*/
function getEntity($element=false, $shared=false)
function getEntity($element=false, $shared=0)
{
global $conf, $mc;
@@ -112,12 +112,9 @@ function getEntity($element=false, $shared=false)
else
{
$out='';
$addzero = array('user', 'usergroup');
if (in_array($element, $addzero)) $out.= '0,';
$out.= $conf->entity;
return $out;
}
}