[ERP-381] fix formula

diff --git a/erp24/records/BouquetComposition.php b/erp24/records/BouquetComposition.php
index 23cd7b725de3a5d5ea684989048d131ff0418eec..dc1e1a58b3d177a85336586f21a5da2540bf6c2c 100644 (file)
--- a/erp24/records/BouquetComposition.php
+++ b/erp24/records/BouquetComposition.php
@@ -435,7 +435,7 @@ class BouquetComposition extends ActiveRecord
             $costModel->selfcost_markup_price = 0.3 * $costModel->selfcost;
         }
         $costModel->price = round($cost);
-        $costModel->price_markup = $costModel->selfcost > 0 ? 100 * $costModel->price / ($costModel->selfcost_markup_price + $costModel->selfcost) : 0;
+        $costModel->price_markup = $costModel->selfcost > 0 ? 100 * ($costModel->price / ($costModel->selfcost_markup_price + $costModel->selfcost) - 1) : 0;
         $costModel->save();
     }
 
@@ -449,7 +449,7 @@ class BouquetComposition extends ActiveRecord
             $costModel->selfcost_markup = 30;
             $costModel->selfcost_markup_price = 0.3 * $costModel->selfcost;
             $costModel->price = round(1.15 * ($costModel->selfcost_markup_price + $costModel->selfcost));
-            $costModel->price_markup = $costModel->selfcost > 0 ? 100 * $costModel->price / ($costModel->selfcost_markup_price + $costModel->selfcost) : 0;
+            $costModel->price_markup = $costModel->selfcost > 0 ? 100 * ($costModel->price / ($costModel->selfcost_markup_price + $costModel->selfcost) - 1): 0;
             $costModel->save();
         }
         return $costModel;