]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commit
Merge branch 'refs/heads/develop' into feature_fomichev_erp-361_week_write_offs_share...
authorfomichev <vladimir.fomichev@erp-flowers.ru>
Wed, 28 May 2025 12:53:07 +0000 (15:53 +0300)
committerfomichev <vladimir.fomichev@erp-flowers.ru>
Wed, 28 May 2025 12:53:07 +0000 (15:53 +0300)
commitd03d1cb2777c8bb20c6cde4cc9d713fb7796eccd
tree010e49ccf7b2647cd38201d48a7e57f34f373c6d
parente75300ffa1d516de2774d283591bda696d227f79
parentb0f142d20e735af0c3dcb308e999e07be09eed94
Merge branch 'refs/heads/develop' into feature_fomichev_erp-361_week_write_offs_share_calculation

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