]> 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>
Wed, 20 Aug 2025 14:04:51 +0000 (17:04 +0300)
committerVladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Wed, 20 Aug 2025 14:04:51 +0000 (17:04 +0300)
commit2c63ddbc37476f9dae698950fc55d093b3c3e099
treeda2736d01d9086ea583ca955ef26e93d27779220
parent3d0f7cf150fcaecf9fe421a76569a790323eea79
parent3cdb8d4f5989595784c593a425613123ca09e628
Merge branch 'refs/heads/develop' into feature_fomichev_erp-457_nomenclature_actuality_autoplan_calculate

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