Merge branch 'develop' into feature_zozirova_erp-360_autoplannogramma_build

author marina <m.zozirova@gmail.com>

Wed, 18 Jun 2025 12:54:47 +0000 (15:54 +0300)

committer marina <m.zozirova@gmail.com>

Wed, 18 Jun 2025 12:54:47 +0000 (15:54 +0300)
author marina <m.zozirova@gmail.com>
Wed, 18 Jun 2025 12:54:47 +0000 (15:54 +0300)
committer marina <m.zozirova@gmail.com>
Wed, 18 Jun 2025 12:54:47 +0000 (15:54 +0300)
diff --cc erp24/controllers/AutoPlannogrammaController.php
Simple merge
diff --cc erp24/services/AutoPlannogrammaService.php
Simple merge
author	marina <m.zozirova@gmail.com>
	Wed, 18 Jun 2025 12:54:47 +0000 (15:54 +0300)
committer	marina <m.zozirova@gmail.com>
	Wed, 18 Jun 2025 12:54:47 +0000 (15:54 +0300)
		1	2
erp24/controllers/AutoPlannogrammaController.php	patch \|	diff1 \|	diff2 \|	blob \| history
erp24/services/AutoPlannogrammaService.php	patch \|	diff1 \|	diff2 \|	blob \| history