]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commit
Merge branch 'refs/heads/develop' into feature_fomichev_erp_444_OS_autoplannogramm
authorVladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Tue, 5 Aug 2025 13:59:59 +0000 (16:59 +0300)
committerVladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Tue, 5 Aug 2025 13:59:59 +0000 (16:59 +0300)
commite304b1386366c42f56278e9dd63dcae76852cbc9
tree457d7385535fa5b2a1d071c62320fa111784127d
parent6d22acdb5d74238249c5760f5567d8468daa6dc2
parentb160bf84b537a2f85df83df640b829c65c816286
Merge branch 'refs/heads/develop' into feature_fomichev_erp_444_OS_autoplannogramm

# Conflicts:
# erp24/controllers/AutoPlannogrammaController.php
# erp24/web/js/autoplannogramma/autoplannogramma.js
erp24/commands/CronController.php
erp24/controllers/AutoPlannogrammaController.php
erp24/services/AutoPlannogrammaService.php
erp24/views/auto-plannogramma/index.php
erp24/web/js/autoplannogramma/autoplannogramma.js