Merge branch 'develop' into 243_fixes

author marina <m.zozirova@gmail.com>

Tue, 3 Dec 2024 12:09:40 +0000 (15:09 +0300)

committer marina <m.zozirova@gmail.com>

Tue, 3 Dec 2024 12:09:40 +0000 (15:09 +0300)
author marina <m.zozirova@gmail.com>
Tue, 3 Dec 2024 12:09:40 +0000 (15:09 +0300)
committer marina <m.zozirova@gmail.com>
Tue, 3 Dec 2024 12:09:40 +0000 (15:09 +0300)
diff --cc erp24/controllers/ShiftTransferController.php
Simple merge
author	marina <m.zozirova@gmail.com>
	Tue, 3 Dec 2024 12:09:40 +0000 (15:09 +0300)
committer	marina <m.zozirova@gmail.com>
	Tue, 3 Dec 2024 12:09:40 +0000 (15:09 +0300)