Merged latest changes from stable branch.

[fa-stable.git] / config.default.php

diff --git a/config.default.php b/config.default.php
index a932d258b149060ce871d21628f0176dd7b6d320..1eeba6e41c992b5cfc92388898ed08c57f4b499e 100644 (file)
--- a/config.default.php
+++ b/config.default.php
@@ -139,7 +139,7 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
        /* allow reopening closed transactions */
        $allow_gl_reopen = 0;
 
-       $dateformats    = array("MMDDYYYY", "DDMMYYYY", "YYYYMMDD");
+       $dateformats    = array("MMDDYYYY", "DDMMYYYY", "YYYYMMDD","MmmDDYYYY", "DDMmmYYYY", "YYYYMmmDD");
        $dateseps               = array("/", ".", "-", " ");
        $thoseps                = array(",", ".", " ");
        $decseps                = array(".", ",");
@@ -264,3 +264,12 @@ $text_company_selection  = false;
 */
 $login_delay = 30;
 $login_max_attempts = 10;
+
+/*
+       Choose Exchange Rate Provider
+       Default is ECB for backwards compatibility
+*/
+$xr_providers = array("ECB", "YAHOO", "GOOGLE", "BLOOMBERG");
+$dflt_xr_provider = 0;
+
+?>
\ No newline at end of file