X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fcurrent_user.inc;h=bca45f0875cdcd589a6430b5b701498979e04d67;hb=d3f047621e21e734300f97c1361a4c7b96e0f385;hp=e9125bcd755fa1d0cfb0b637509f9c38311d7870;hpb=9dab04be9d81766f1878d3688ee73d0bcf29f5d2;p=fa-stable.git diff --git a/includes/current_user.inc b/includes/current_user.inc index e9125bcd..bca45f08 100644 --- a/includes/current_user.inc +++ b/includes/current_user.inc @@ -239,6 +239,15 @@ function price_decimal_format($number, &$dec) } return number_format2($number, $dec); } +// function money_format doesn't exist in OS Win. +if (!function_exists('money_format')) +{ + function money_format($format, $number) + { + return price_format($number); + } +} + // 2008-06-15. Added extra parameter $stock_id and reference for $dec //-------------------------------------------------------------------- function qty_format($number, $stock_id=null, &$dec) { @@ -272,10 +281,12 @@ function user_numeric($input) { $num = trim($input); $sep = $thoseps[user_tho_sep()]; - if($sep!='') $num = str_replace( $sep, '', $num); - str_replace($sep, '', $num); + if ($sep!='') + $num = str_replace( $sep, '', $num); + $sep = $decseps[user_dec_sep()]; - if($sep!='.') $num = str_replace( $sep, '.', $num); + if ($sep!='.') + $num = str_replace( $sep, '.', $num); if (!is_numeric($num)) return false;