]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commit
Merge branch 'develop' into feature_zozirova_erp-85_1c_buh_connect
authormarina <m.zozirova@gmail.com>
Mon, 26 Aug 2024 12:29:40 +0000 (15:29 +0300)
committermarina <m.zozirova@gmail.com>
Mon, 26 Aug 2024 12:29:40 +0000 (15:29 +0300)
commitb3d28271b4ccf065ea0b995fd37c516396a9ad79
tree47bf161ce6eccd7993465e9410f0f4bd9dde3bd5
parentf5e08febc10e4100a242ca49354b5ccd962425fa
parentbe4d14f3e3f31cf8af58ff6016a82275c954911c
Merge branch 'develop' into feature_zozirova_erp-85_1c_buh_connect

# Conflicts:
# erp24/composer.json
# erp24/records/Motivation.php
# erp24/records/MotivationBuh.php
# erp24/records/MotivationBuhValue.php
erp24/records/Motivation.php
erp24/records/MotivationBuhValue.php
erp24/records/MotivationCostsItem.php