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

NEW: expense report: show link to already existing overlapping expense report

Browse Source
This commit is contained in:
Marc de Lima Lucio 2021-09-30 16:51:31 +02:00
parent 3d4bb66853
commit 6a66fcbff8
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/expensereport/card.php
View File

@ -266,10 +266,14 @@ if (empty($reshook)) {
} }
} }
if (!$error && empty($conf->global->EXPENSEREPORT_ALLOW_OVERLAPPING_PERIODS) && $object->periode_existe($fuser, $object->date_debut, $object->date_fin)) { if (!$error && empty($conf->global->EXPENSEREPORT_ALLOW_OVERLAPPING_PERIODS)) {
$error++; $overlappingExpenseReportID = $object->periode_existe($fuser, $object->date_debut, $object->date_fin, true);
setEventMessages($langs->trans("ErrorDoubleDeclaration"), null, 'errors');
$action = 'create'; if ($overlappingExpenseReportID > 0) {
$error++;
setEventMessages($langs->trans("ErrorDoubleDeclaration").' <a href="'.$_SERVER['PHP_SELF'].'?id='.$overlappingExpenseReportID.'">'. $langs->trans('ShowTrip').'</a>', null, 'errors');
$action = 'create';
}
} }
if (!$error) { if (!$error) {

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

@ -2195,9 +2195,10 @@ 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) public function periode_existe($fuser, $date_debut, $date_fin, $return_id = false)
{ {
// phpcs:enable // phpcs:enable
$sql = "SELECT rowid, date_debut, date_fin"; $sql = "SELECT rowid, date_debut, date_fin";
@ -2213,8 +2214,6 @@ class ExpenseReport extends CommonObject
$date_d_form = $date_debut; $date_d_form = $date_debut;
$date_f_form = $date_fin; $date_f_form = $date_fin;
$existe = false;
while ($i < $num_rows) { while ($i < $num_rows) {
$objp = $this->db->fetch_object($result); $objp = $this->db->fetch_object($result);
@ -2222,17 +2221,13 @@ 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)) {
$existe = true; return $return_id ? $objp->rowid : 1;
} }
$i++; $i++;
} }
if ($existe) { return 0;
return 1;
} else {
return 0;
}
} else { } else {
return 0; return 0;
} }