]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commit
Merge branch 'refs/heads/develop' into feature_fomichev_erp-20250729_nomenclature_actual
authorVladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Fri, 22 Aug 2025 06:28:37 +0000 (09:28 +0300)
committerVladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Fri, 22 Aug 2025 06:28:37 +0000 (09:28 +0300)
commite3f62fcf2a0f85aaa96f35e1f2725bd59989fb62
treed899cecafd6e2dd1c4957ee0ff33f5848e979821
parent4988830ccc04611119b8f623976a158998ef48a5
parent6db64cc14abcabd23f358d3290fa1351371016e9
Merge branch 'refs/heads/develop' into feature_fomichev_erp-20250729_nomenclature_actual

# Conflicts:
# erp24/services/AutoPlannogrammaService.php
erp24/services/AutoPlannogrammaService.php
erp24/services/StorePlanService.php