blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 12:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

exclude werkvertrag from overlap check

Browse Source
This commit is contained in:
Harald Bamberger
2023-11-14 14:09:06 +01:00
parent d6ce81462f
commit 98eb3fbd8b
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/vertragsbestandteil/Dienstverhaeltnis.php
+2 -1
View File
@@ -247,7 +247,8 @@ EOTXT;
$this->validationerrors[] = 'Das Beginndatum muss vor dem Endedatum liegen.';
}
if( $this->checkoverlap && $ci->VertragsbestandteilLib->isOverlappingExistingDV($this) )
if( $this->checkoverlap && !($this->vertragsart_kurzbz === 'werkvertrag')
&& $ci->VertragsbestandteilLib->isOverlappingExistingDV($this) )
{
$this->validationerrors[] = 'Es existiert bereits ein überlappendes Dienstverhältnis';
}
application/models/vertragsbestandteil/Dienstverhaeltnis_model.php
+2
View File
@@ -119,6 +119,8 @@ class Dienstverhaeltnis_model extends DB_Model
dv.mitarbeiter_uid = ?
AND
dv.oe_kurzbz = ?
AND
dv.vertragsart_kurzbz != 'werkvertrag'
AND
?::date <= COALESCE(dv.bis, '2170-12-31'::date)
AND