Merge branch 'master' into dev

biz-hd/product/classes/ProductClass.php

@@ -257,7 +257,7 @@ class ProductClass extends BaseClass
             }
             $list[$k]['price'] = $price;
 
-            $cost = $v['cost'] ?? 0;
+            $cost = $v['avCost'] ?? 0;
             $ml = 0;
             if ($price > 0) {
                 $profit = bcsub($price, $cost, 2);