]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commit
Merge branch 'develop' into feature_fomichev_erp-363_week_forecast
authorVladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Wed, 18 Jun 2025 12:03:02 +0000 (15:03 +0300)
committerVladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Wed, 18 Jun 2025 12:03:02 +0000 (15:03 +0300)
commitbe621b779619f4178c51cfc56d23b0de0dcaa794
treeae71ccb3c9cc831b3a1fe573243d4fcb59457acd
parent419bf33f0f62ac30a187a1e40c08e06fc6ea9582
parentf6faf1299f1d2afe9d96a216ade1ced07edc9f3e
Merge branch 'develop' into feature_fomichev_erp-363_week_forecast

# Conflicts:
# erp24/controllers/AutoPlannogrammaController.php
# erp24/services/AutoPlannogrammaService.php
erp24/controllers/AutoPlannogrammaController.php
erp24/services/AutoPlannogrammaService.php