]> 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, 17 Dec 2024 07:23:26 +0000 (10:23 +0300)
committermarina <m.zozirova@gmail.com>
Tue, 17 Dec 2024 07:23:26 +0000 (10:23 +0300)
commit536d6d0ce266890f01af389917467132359c6251
tree3ca8f743553fb2e35cac511ab1959c3ad3ee9d11
parent8634f3d9ce77086274341398f66e0ff1a5e19600
parent25266d55ceb866387f67bd0468d59af900922890
Merge branch 'develop' into feature-zozirova-erp_256-send_doc_on_1c

# Conflicts:
# erp24/records/WaybillIncoming.php
# erp24/views/shift-transfer/_transfer.php
erp24/controllers/ShiftTransferController.php
erp24/records/WaybillIncoming.php
erp24/records/WaybillWriteOffs.php
erp24/views/shift-transfer/_transfer.php