]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commit
Merge branch 'develop' into feature_smirnov_erp-381_edit_price_and_show_nacenka
authorAlexander Smirnov <fredeom@mail.ru>
Fri, 28 Mar 2025 09:44:55 +0000 (12:44 +0300)
committerAlexander Smirnov <fredeom@mail.ru>
Fri, 28 Mar 2025 09:44:55 +0000 (12:44 +0300)
commit0bd81ad739c14c183759ce6aacd8a6a5f3e5698d
tree4e44adcd70b40c4ac46962e703ec1c60fee198e4
parent89ea94ccc360083f3bf2a1320143285fe3cb00c1
parent45b5f2802171a9ff6342386209c9e127ea76fc24
Merge branch 'develop' into feature_smirnov_erp-381_edit_price_and_show_nacenka

# Conflicts:
# erp24/controllers/BouquetController.php
erp24/controllers/BouquetController.php
erp24/records/BouquetComposition.php
erp24/views/bouquet/_product_list.php
erp24/web/js/bouquet/bouquet.js