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

FIX: expense report: show link to already existing overlapping expense report without adding new parameter

Browse Source
This commit is contained in:
Marc de Lima Lucio 2021-10-04 08:51:31 +02:00
parent 6a66fcbff8
commit 704bae46a6
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2195,10 +2195,9 @@ class ExpenseReport extends CommonObject
* @param User $fuser User * @param User $fuser User
* @param integer $date_debut Start date * @param integer $date_debut Start date
* @param integer $date_fin End date * @param integer $date_fin End date
* @param bool $return_id True to return ID of existing expense report
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
public function periode_existe($fuser, $date_debut, $date_fin, $return_id = false) public function periode_existe($fuser, $date_debut, $date_fin)
{ {
// phpcs:enable // phpcs:enable
$sql = "SELECT rowid, date_debut, date_fin"; $sql = "SELECT rowid, date_debut, date_fin";
@ -2221,7 +2220,7 @@ class ExpenseReport extends CommonObject
$date_f_req = $this->db->jdate($objp->date_fin); // 4 $date_f_req = $this->db->jdate($objp->date_fin); // 4
if (!($date_f_form < $date_d_req || $date_d_form > $date_f_req)) { if (!($date_f_form < $date_d_req || $date_d_form > $date_f_req)) {
return $return_id ? $objp->rowid : 1; return $objp->rowid;
} }
$i++; $i++;