From: Alexander Smirnov Date: Thu, 8 Aug 2024 08:47:23 +0000 (+0300) Subject: Merge branch 'develop' into feature_smirnov_erp-100_services_delivery_for_motivation X-Git-Tag: 1.4~44^2 X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=7da94ee377ce548a4cfdffd42da1c923ae0d131e;p=erp24_rep%2Fyii-erp24%2F.git Merge branch 'develop' into feature_smirnov_erp-100_services_delivery_for_motivation # Conflicts: # erp24/uploads/template_plan.xlsx --- 7da94ee377ce548a4cfdffd42da1c923ae0d131e