Merge branch 'feature_fomichev_erp-470_add_analitycs_business_operations_to_shift_tra...

author Aleksey Filippov <aleksey.filippov@erp-flowers.ru>

Wed, 15 Oct 2025 13:54:09 +0000 (13:54 +0000)

committer Aleksey Filippov <aleksey.filippov@erp-flowers.ru>

Wed, 15 Oct 2025 13:54:09 +0000 (13:54 +0000)
author Aleksey Filippov <aleksey.filippov@erp-flowers.ru>
Wed, 15 Oct 2025 13:54:09 +0000 (13:54 +0000)
committer Aleksey Filippov <aleksey.filippov@erp-flowers.ru>
Wed, 15 Oct 2025 13:54:09 +0000 (13:54 +0000)
diff --cc erp24/api2/controllers/DataController.php
Simple merge
diff --cc erp24/records/WriteOffsErp.php
Simple merge
author	Aleksey Filippov <aleksey.filippov@erp-flowers.ru>
	Wed, 15 Oct 2025 13:54:09 +0000 (13:54 +0000)
committer	Aleksey Filippov <aleksey.filippov@erp-flowers.ru>
	Wed, 15 Oct 2025 13:54:09 +0000 (13:54 +0000)
		1	2
erp24/api2/controllers/DataController.php	patch \|	diff1 \|	diff2 \|	blob \| history
erp24/records/WriteOffsErp.php	patch \|	diff1 \|	diff2 \|	blob \| history