From: Aleksey Filippov <aleksey.filippov@erp-flowers.ru>
Date: Tue, 16 Jul 2024 09:12:06 +0000 (+0000)
Subject: Merge branch 'fix_zozirova_erp-112_merge_shifts_without_plan' into 'develop'
X-Git-Tag: 1.4~77
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=1d2f2ec4bf0095b6675959561680c96f4d352470;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'fix_zozirova_erp-112_merge_shifts_without_plan' into 'develop'

Fix zozirova erp 112 merge shifts without plan

See merge request gitlab-instance/yii-erp24!261
---

1d2f2ec4bf0095b6675959561680c96f4d352470