Added currency symbol, setting.

diff --git a/Current Development Check List.md b/Current Development Check List.md
index 62b5d957404fc0dcf4c06bb0f891073cc85ff493..ac30be311f06abd7746a7676d5bea914aa958cd4 100644 (file)
--- a/Current Development Check List.md
+++ b/Current Development Check List.md
@@ -6,13 +6,15 @@
 
 ### New Development v.2.3+
 
+* ✔ Printout page to include Amount column if category of items has valued asset, expense or income set. Providing also totals. Of Assets, and total on income and expense.
+  * Introduce Currency setting, to replace amount '#'. Even though it could be number of, somthing not currency related.
 * ✔ Interaction - When editing an existing log entry, it needs confirmation, if it isn't a copy (now button wasn't pressed), before overwriting.
   * i.e, Warning! - Existing entry has been changed, are you sure do you want to overwrite it?
 * ✔ Configuration needs to be updated, to use CNF 2.2, for system reset, etc.
   * Config file "Data Fix* reset of settings updated to properly revert to factory defaults.
   * We need to also display stats for log file of the web server.
     * Maybe provide an rotational purge on config page access. i.e. if line count is over 1000, purge to tail -n 1000.
-      * - This sure an config file setting. i.e. <<WEB_SERVER_LOG_TAIL_LIMIT><1000>>>
+      * This sure an config file setting. i.e. <<WEB_SERVER_LOG_TAIL_LIMIT><1000>>>
 * &#10004; Backup/Restore made various db engine aware and compatible. As the data is the same.
   * The data is the same, Structure, binary data and password handling is different, engine dependant.
 * &#10004; Fix themes. Themes don't display and set consistently the pages throughout.

diff --git a/htdocs/cgi-bin/config.cgi b/htdocs/cgi-bin/config.cgi
index 14dd293047fb82594223d79684c58d026bd3c36b..b29139a8d29d8e89ce060f5701bed28ae7a954d4 100755 (executable)
--- a/htdocs/cgi-bin/config.cgi
+++ b/htdocs/cgi-bin/config.cgi
@@ -708,7 +708,7 @@ elsif($chdbfix){
         </td></tr>
         </form></TABLE>);
 
-        &Settings::getTheme;
+        &Settings::setupTheme;
         &getHeader;
 
         print "<div>$output</div>";

diff --git a/htdocs/cgi-bin/system/modules/Settings.pm b/htdocs/cgi-bin/system/modules/Settings.pm
index 43263144dc84606f4fc2c44c40bbb44a88fa59bd..c044e116eeceb2e22ca9eb4b9879cad8d62620b4 100644 (file)
--- a/htdocs/cgi-bin/system/modules/Settings.pm
+++ b/htdocs/cgi-bin/system/modules/Settings.pm
@@ -81,6 +81,7 @@ our $KEEP_EXCS    = 0;
 our $COMPRESS_ENC = 0; #HTTP Compressed encoding.
 our $DBI_SOURCE   = "DBI:SQLite:";
 our $DBI_LVAR_SZ  = 1024;
+our $CURR_SYMBOL  = '$';
 
 my ($cgi, $sss, $sid, $alias, $pass, $dbname, $pub);
 our $DSN;
@@ -135,6 +136,7 @@ sub displayAll     {$DISP_ALL}
 sub trackLogins    {$TRACK_LOGINS}
 sub windowRTFSize  {$RTF_SIZE}
 sub keepExcludes   {$KEEP_EXCS}
+sub currenySymbol  {$CURR_SYMBOL}
 sub bgcol          {$BGCOL}
 sub css            {$TH_CSS}
 sub js             {$JS}
@@ -428,6 +430,7 @@ sub getConfiguration {
                 when ("KEEP_EXCS")   {$KEEP_EXCS    = $r[2]}
                 when ("TRACK_LOGINS"){$TRACK_LOGINS = $r[2]}
                 when ("COMPRESS_ENC"){$COMPRESS_ENC = $r[2]}
+                when ("CURR_SYMBOL") {$CURR_SYMBOL  = $r[2]}
                 default              {$anons{$r[1]} = $r[2]}
                 }
         }