]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commitdiff
projects / erp24_rep / yii-erp24 / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d74d7e8 e0c7bb1)
Merge branch 'develop' into feature_smirnov_erp-130_write_offs_for_motivation_NEW
authorAlexander Smirnov <fredeom@mail.ru>
Mon, 2 Sep 2024 14:33:43 +0000 (17:33 +0300)
committerAlexander Smirnov <fredeom@mail.ru>
Mon, 2 Sep 2024 14:33:43 +0000 (17:33 +0300)
1  2 
erp24/records/MotivationCostsItem.php patch | diff1 | diff2 | blob | history
erp24/services/MotivationService.php patch | diff1 | diff2 | blob | history

diff --cc erp24/records/MotivationCostsItem.php
Simple merge
diff --cc erp24/services/MotivationService.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.