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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2019-12-18 14:34:39 +01:00
commit 2de16c3c66
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2352,7 +2352,7 @@ class ExpenseReport extends CommonObject
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {
$langs->load("members"); $langs->load("trips");
$response = new WorkboardResponse(); $response = new WorkboardResponse();
if ($option == 'toapprove') if ($option == 'toapprove')
@ -2409,7 +2409,7 @@ class ExpenseReport extends CommonObject
{ {
global $conf; global $conf;
//Only valid members // Only valid expenses reports
if ($option == 'toapprove' && $this->status != 2) return false; if ($option == 'toapprove' && $this->status != 2) return false;
if ($option == 'topay' && $this->status != 5) return false; if ($option == 'topay' && $this->status != 5) return false;