X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fcurrent_user.inc;h=239324c69dd0f304942fbc8980a88da21eb68afe;hb=314da04d8ef9a6d7f8482aeb069d9cbc3d34724c;hp=62d729b628963c11f352412f549b42faa7f886bd;hpb=7b8a565a1de2c6ed3c86133efb39e31b24c380a0;p=fa-stable.git diff --git a/includes/current_user.inc b/includes/current_user.inc index 62d729b6..239324c6 100644 --- a/includes/current_user.inc +++ b/includes/current_user.inc @@ -302,9 +302,9 @@ function round2($number, $decimals=0) function number_format2($number, $decimals=0) { global $SysPrefs; - $tsep = $SysPrefs->thoseps[user_dec_sep()]; + $tsep = $SysPrefs->thoseps[user_tho_sep()]; $dsep = $SysPrefs->decseps[user_dec_sep()]; - //return number_format($number, $decimals, $dsep, $tsep); + if($decimals==='max') $dec = 15 - floor(log10(abs($number))); else { @@ -414,12 +414,12 @@ function user_numeric($input) { $num = str_replace( $sep, '.', $num); if (!is_numeric($num)) - return false; + return false; $num = (float)$num; if ($num == (int)$num) - return (int)$num; + return (int)$num; else - return $num; + return $num; } function user_company()