]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commit
Merge branch 'refs/heads/develop' into feature_fomichev_erp-457_nomenclature_actualit...
authorVladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Mon, 25 Aug 2025 12:06:08 +0000 (15:06 +0300)
committerVladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Mon, 25 Aug 2025 12:06:08 +0000 (15:06 +0300)
commit7bb179b05c346b29340a8f9f8bb923db5c3cf496
tree9e1cb711102ba89493a218e5875bba763c84d057
parentae6faae0f704e6b9d703028584fee2610bb8dfb1
parentf5ab023063462f82cc18df127c45ef67b2e35424
Merge branch 'refs/heads/develop' into feature_fomichev_erp-457_nomenclature_actuality_autoplan_calculate

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