From: Alexander Smirnov <fredeom@mail.ru>
Date: Tue, 3 Sep 2024 12:02:02 +0000 (+0300)
Subject: Merge branch 'develop' into feature_smirnov_erp-130_write_offs_for_motivation_NEW
X-Git-Tag: 1.4~11^2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=470ff9a45e1d98a477546bec26f8872cc985cd28;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'develop' into feature_smirnov_erp-130_write_offs_for_motivation_NEW

# Conflicts:
#	erp24/views/motivation/index.php
---

470ff9a45e1d98a477546bec26f8872cc985cd28