[Fmsystem-commits] [13574]

[Nelson Guerra]

Revision: 13574
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13574
Author:   nelson224
Date:     2015-07-07 20:52:26 +0000 (Tue, 07 Jul 2015)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind/rental/inc/class.uicommon.inc.php

Modified: branches/dev-syncromind/rental/inc/class.uicommon.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/class.uicommon.inc.php   2015-07-07 
14:05:12 UTC (rev 13573)
+++ branches/dev-syncromind/rental/inc/class.uicommon.inc.php   2015-07-07 
20:52:26 UTC (rev 13574)
@@ -30,6 +30,11 @@
                
                public $flash_msgs;
                
+               public $decimalSeparator;
+               public $thousandsSeparator;
+               public $decimalPlaces;
+               public $currency_suffix;
+               
                public function __construct()
                {
                        parent::__construct();
@@ -65,6 +70,14 @@
                                ADMINISTRATOR => $this->isAdministrator()
                        );
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang($GLOBALS['phpgw_info']['flags']['currentapp']);
+                       
+                       $config = CreateObject('phpgwapi.config','rental');
+                       $config->read();                        
+                       
+                       $this->thousandsSeparator = 
($GLOBALS['phpgw_info']['user']['preferences']['rental']['thousands_separator'])
 ? 
$GLOBALS['phpgw_info']['user']['preferences']['rental']['thousands_separator'] 
: ' ';
+                       $this->decimalSeparator = 
($GLOBALS['phpgw_info']['user']['preferences']['rental']['decimal_separator']) 
? $GLOBALS['phpgw_info']['user']['preferences']['rental']['decimal_separator'] 
: ',';
+                       $this->decimalPlaces = 
($GLOBALS['phpgw_info']['user']['preferences']['rental']['currency_decimal_places'])
 ? 
$GLOBALS['phpgw_info']['user']['preferences']['rental']['currency_decimal_places']
 : 2;
+                       $this->currency_suffix = 
($config->config_data['currency_suffix']) ? 
$config->config_data['currency_suffix'] : 'NOK';
                }
                
                /**