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

Fix merge

Browse Source
This commit is contained in:
Laurent Destailleur 2017-02-27 01:23:21 +01:00
parent 4f24613de0
commit 04044df36a
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/expensereport/class/api_expensereports.class.php
View File

@ -396,7 +396,7 @@ class ExpenseReports extends DolibarrApi
$this->expensereport->$field = $value; $this->expensereport->$field = $value;
} }
if($this->expensereport->update($id, DolibarrApiAccess::$user,1,'','','update')) if($this->expensereport->update(DolibarrApiAccess::$user))
return $this->get($id); return $this->get($id);
return false; return false;

9
htdocs/expensereport/class/expensereport.class.php
View File

@ -324,18 +324,11 @@ class ExpenseReport extends CommonObject
* update * update
* *
* @param User $user User making change * @param User $user User making change
<<<<<<< HEAD
* @param int $notrigger Disable triggers * @param int $notrigger Disable triggers
=======
* @param User $newuser New user we want to have the expense report on. * @param User $newuser New user we want to have the expense report on.
>>>>>>> branch '5.0' of git@github.com:Dolibarr/dolibarr.git
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
<<<<<<< HEAD function update($user, $notrigger = 0, $userofexpensereport=null)
function update($user, $notrigger = 0)
=======
function update($user, $userofexpensereport=null)
>>>>>>> branch '5.0' of git@github.com:Dolibarr/dolibarr.git
{ {
global $langs; global $langs;