Merge branch 'develop' into feature_smirnov_erp-130_write_offs_for_motivation_NEW

author Alexander Smirnov <fredeom@mail.ru>

Thu, 29 Aug 2024 12:24:36 +0000 (15:24 +0300)

committer Alexander Smirnov <fredeom@mail.ru>

Thu, 29 Aug 2024 12:24:36 +0000 (15:24 +0300)
author Alexander Smirnov <fredeom@mail.ru>
Thu, 29 Aug 2024 12:24:36 +0000 (15:24 +0300)
committer Alexander Smirnov <fredeom@mail.ru>
Thu, 29 Aug 2024 12:24:36 +0000 (15:24 +0300)
diff --cc erp24/records/MotivationCostsItem.php
Simple merge
diff --cc erp24/services/MotivationService.php
Simple merge
author	Alexander Smirnov <fredeom@mail.ru>
	Thu, 29 Aug 2024 12:24:36 +0000 (15:24 +0300)
committer	Alexander Smirnov <fredeom@mail.ru>
	Thu, 29 Aug 2024 12:24:36 +0000 (15:24 +0300)
		1	2
erp24/records/MotivationCostsItem.php	patch \|	diff1 \|	diff2 \|	blob \| history
erp24/services/MotivationService.php	patch \|	diff1 \|	diff2 \|	blob \| history