[0000225] Supplier Payment Report showing paid invoices (rounding problem)

[fa-stable.git] / includes / current_user.inc

diff --git a/includes/current_user.inc b/includes/current_user.inc
index e9125bcd755fa1d0cfb0b637509f9c38311d7870..ea106e152b081c57a51d0a0215ae6f0ceed87990 100644 (file)
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -193,7 +193,7 @@ class current_user
                                $date_format, $date_sep, $tho_sep, $dec_sep, $theme, $pagesize, 
                                $show_hints, $profile, $rep_popup, $query_size, $graphic_links, $lang, $stickydate, $startup_tab);
                }
-               $this->prefs = new user_prefs($user);
+               $this->prefs = new user_prefs(get_user($this->user));
        }
 }
 
@@ -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;