]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commit
Merge branch 'develop' into feature-zozirova-erp_256-send_doc_on_1c
authormarina <m.zozirova@gmail.com>
Tue, 10 Dec 2024 11:15:07 +0000 (14:15 +0300)
committermarina <m.zozirova@gmail.com>
Tue, 10 Dec 2024 11:15:07 +0000 (14:15 +0300)
commit43d30f5a1d6cdddf6bfee6e77730b877937c65df
tree52489e914ba25e82e0222653ff4ff36b72ac4ace
parent1fe5a575488891e60b6b45a8f5d10aadfc7661f2
parent743ae53168a5cf1e8ed59ff2c3e30986278d4d80
Merge branch 'develop' into feature-zozirova-erp_256-send_doc_on_1c

# Conflicts:
# erp24/controllers/ShiftTransferController.php
# erp24/records/EqualizationRemains.php
# erp24/views/shift-transfer/_replacement.php
erp24/controllers/ShiftTransferController.php
erp24/records/EqualizationRemains.php
erp24/records/ShiftTransfer.php
erp24/views/shift-transfer/_replacement.php
erp24/views/store-balance/index.php