]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commit
Merge branch 'refs/heads/develop' into feature_fomichev_erp-443_add_canceled_orders_t...
authorVladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Mon, 25 Aug 2025 08:37:04 +0000 (11:37 +0300)
committerVladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Mon, 25 Aug 2025 08:37:04 +0000 (11:37 +0300)
commitad22aa70335ac7dd78441ae512bc1ab883d30671
tree061ff26d6ab0f33c3d04eb0772e7ccaeea2bb573
parent307b99a9f6e9a74e59dbc2f658fae1954b2dcffb
parent2189981fbc790570cd99f6ebedd6b1c8c9303340
Merge branch 'refs/heads/develop' into feature_fomichev_erp-443_add_canceled_orders_to_1c_exchange_request

# Conflicts:
# erp24/api2/controllers/DataController.php
# erp24/services/MarketplaceService.php
erp24/api2/controllers/DataController.php
erp24/api2/controllers/OrdersController.php
erp24/records/MarketplaceOrders.php
erp24/services/MarketplaceService.php