]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commit
Merge branch 'refs/heads/develop' into feature_fomichev_erp-497_add_count_on_shift_to...
authorVladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Thu, 4 Dec 2025 12:07:33 +0000 (15:07 +0300)
committerVladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Thu, 4 Dec 2025 12:07:33 +0000 (15:07 +0300)
commitecb6d2cfe44de1d18bc533f17140e4209ee5d214
treee6e97fc7b797ca167c09dcab9b74b7942cd5e061
parent190004adb0f567b6f5e8d1138b7b6ae31ca0cac5
parent7832b43cdc25a011a863ef8dba5f2795b71a98f9
Merge branch 'refs/heads/develop' into feature_fomichev_erp-497_add_count_on_shift_to_report

# Conflicts:
# erp24/actions/grade/AdminUpdateAction.php
# erp24/api3/core/services/ReportService.php
erp24/actions/grade/AdminUpdateAction.php
erp24/api3/core/services/ReportService.php
erp24/records/AdminGroup.php