From: Alexander Smirnov Date: Thu, 5 Sep 2024 08:21:05 +0000 (+0300) Subject: [ERP-107] поправил формулу X-Git-Tag: 1.4~2^2~1 X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=29f1a0a6d7b3f71ab63c597eb6d7d02e77f35352;p=erp24_rep%2Fyii-erp24%2F.git [ERP-107] поправил формулу --- diff --git a/erp24/services/MotivationService.php b/erp24/services/MotivationService.php index 44f7f4df..1e5f66a5 100644 --- a/erp24/services/MotivationService.php +++ b/erp24/services/MotivationService.php @@ -1678,7 +1678,8 @@ class MotivationService $j66 = 0; if ($c62 >= $b64) { - $formula = $c62 - $c5 * $motivationDataTableSort[$indMap[self::CODE_THRESHOLD_COEFFICIENT]]["plan"]; // "Пороговый коэффициент" + $formula = ($c62 - $c5 * $motivationDataTableSort[$indMap[self::CODE_THRESHOLD_COEFFICIENT]]["plan"]) * + $motivationDataTableSort[$indMap[self::CODE_BONUS_SIZE]]["plan"]; // ("Чистая прибыль" - "Пороговый коэффициент"*"Выручка от реализации") * "Размер бонуса" if ($formula > 0) { $j66 = $formula; }