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

merge

Browse Source
This commit is contained in:
Florian HENRY 2015-01-19 09:41:31 +01:00
parent ab50437331
commit a4561ab4ad
2 changed files with 49 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/comm/action/class/actioncomm.class.php
View File

@ -151,6 +151,7 @@ class ActionComm extends CommonObject
$this->userassigned=array(); $this->userassigned=array();
$this->userassigned[$tmpid]=array('id'=>$tmpid); $this->userassigned[$tmpid]=array('id'=>$tmpid);
} }
$userownerid=$this->userownerid; $userownerid=$this->userownerid;
$userdoneid=$this->userdoneid; $userdoneid=$this->userdoneid;
@ -243,7 +244,7 @@ class ActionComm extends CommonObject
{ {
foreach($this->userassigned as $key => $val) foreach($this->userassigned as $key => $val)
{ {
if (! is_array($val)) // For backward compatibility when valid if (! is_array($val)) // For backward compatibility when val=id
{ {
$tmpid=$val; $tmpid=$val;
$val=array('id'=>$val); $val=array('id'=>$val);

1
htdocs/compta/facture/class/facture.class.php
View File

@ -2604,6 +2604,7 @@ class Facture extends CommonInvoice
$file = $conf->global->FACTURE_ADDON.".php"; $file = $conf->global->FACTURE_ADDON.".php";
$classname = $conf->global->FACTURE_ADDON; $classname = $conf->global->FACTURE_ADDON;
// Include file with class // Include file with class
$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']); $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);