Merge branch 'fronkdev' into 'master'

Fixed missing decimal places in Contract prices

See merge request fronk/thetool!776

application/Contract/ContractModel.php

@@ -495,6 +495,8 @@ class ContractModel {
       $product_id = $filter['product_id'];
       if(is_numeric($product_id)) {
         $where .= " AND Contract.product_id=$product_id";
+      } elseif(is_array($product_id)) {
+          $where .= " AND Contract.product_id IN (".implode(",", $product_id).")";
       }
     }
     

lib/Helper/Helper.php

@@ -162,7 +162,8 @@ class Helper {
      * @return float
      */
     public static function formatNumber($number, int $decimals = 2, string $decPoint = ",", string $thousandsSep = "."): string {
-        return number_format(intval($number), $decimals, $decPoint, $thousandsSep);
+        if(!is_numeric($number)) return "";
+        return number_format($number, $decimals, $decPoint, $thousandsSep);
     }
 
 }