]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commit
Merge branch 'develop' into feature_smirnov_erp-140_fact_motivation
authorAlexander Smirnov <fredeom@mail.ru>
Thu, 29 Aug 2024 12:38:23 +0000 (15:38 +0300)
committerAlexander Smirnov <fredeom@mail.ru>
Thu, 29 Aug 2024 12:38:23 +0000 (15:38 +0300)
commite7fb32373ae8123b7b9299f21a1db3689f78f54f
tree3a989dd70f4279c7b7f617297216e7f86506d410
parent198562b9a1097bf0451cc97013ffe56c35d22c62
parent626b957e1c46b2338929ae04c2c3d599c84882ea
Merge branch 'develop' into feature_smirnov_erp-140_fact_motivation

# Conflicts:
# erp24/services/MotivationService.php
# erp24/views/motivation/index.php
erp24/actions/motivation/IndexAction.php
erp24/records/MotivationCostsItem.php
erp24/services/MotivationService.php
erp24/views/motivation/index.php