]> 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>
Mon, 2 Sep 2024 14:08:06 +0000 (17:08 +0300)
committerAlexander Smirnov <fredeom@mail.ru>
Mon, 2 Sep 2024 14:08:06 +0000 (17:08 +0300)
commitc97d635227fc1521a4c9d9f83171e6bee1189f74
tree6e5586dd434e97fcf23a48f16326a6e60bc761d6
parentd8c6c48a92c7c8f34359e70a948a2f76c399d234
parente0c7bb18e2fc3935370015f07ae224f8baae7cb7
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