]> 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>
Thu, 19 Dec 2024 08:47:42 +0000 (11:47 +0300)
committermarina <m.zozirova@gmail.com>
Thu, 19 Dec 2024 08:47:42 +0000 (11:47 +0300)
commit72a2c8b32102f4277e9a00f468ecddfbe7f6fffc
treec1c4932f3e338d13fb6448cdee3d4c2f5441f72a
parent38d50a89aba1d2426097356125609c58a83fb07b
parent6715157915567f22dbfa8d3732ec5e7db53ec707
Merge branch 'develop' into feature-zozirova-erp_256-send_doc_on_1c

# Conflicts:
# erp24/records/WaybillWriteOffs.php
erp24/records/WaybillWriteOffs.php