From: Aleksey Filippov <aleksey.filippov@erp-flowers.ru>
Date: Tue, 24 Mar 2026 13:59:15 +0000 (+0000)
Subject: Merge branch 'develop' into 'task-JIRA-ERP-33-20260324070448'
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=98124ad95627be791020d225079d000222d48a6b;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'develop' into 'task-JIRA-ERP-33-20260324070448'

# Conflicts:
#   erp24/services/StockStateService.php
---

98124ad95627be791020d225079d000222d48a6b