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

Merge pull request #19762 from FHenry/dev_fix_19749

Browse Source 
fix: #19749
This commit is contained in:
Laurent Destailleur 2022-01-10 19:10:43 +01:00 committed by GitHub
commit d660a7d45f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/langs/en_US/projects.lang
View File

@ -284,3 +284,4 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
ProjectTasksWithoutTimeSpent=Project tasks without time spent ProjectTasksWithoutTimeSpent=Project tasks without time spent
FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>. FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
StartDateCannotBeAfterEndDate=End date cannot be before start date

10
htdocs/projet/class/task.class.php
View File

@ -165,6 +165,11 @@ class Task extends CommonObject
$this->label = trim($this->label); $this->label = trim($this->label);
$this->description = trim($this->description); $this->description = trim($this->description);
if (!empty($this->date_start) && !empty($this->date_end) && $this->date_start > $this->date_end) {
$this->errors[] = $langs->trans('StartDateCannotBeAfterEndDate');
return -1;
}
// Check parameters // Check parameters
// Put here code to add control on parameters values // Put here code to add control on parameters values
@ -384,6 +389,11 @@ class Task extends CommonObject
$this->budget_amount = trim($this->budget_amount); $this->budget_amount = trim($this->budget_amount);
} }
if (!empty($this->date_start) && !empty($this->date_end) && $this->date_start > $this->date_end) {
$this->errors[] = $langs->trans('StartDateCannotBeAfterEndDate');
return -1;
}
// Check parameters // Check parameters
// Put here code to add control on parameters values // Put here code to add control on parameters values

1
htdocs/projet/tasks/task.php
View File

@ -117,6 +117,7 @@ if ($action == 'update' && !GETPOST("cancel") && $user->rights->projet->creer) {
$result = $object->update($user); $result = $object->update($user);
if ($result < 0) { if ($result < 0) {
setEventMessages($object->error, $object->errors, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
$action = 'edit';
} }
} }
} else { } else {