Merged last changes from stable.

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

diff --git a/config.default.php b/config.default.php
index 5dfa4feef17f0c1eb3558e22029b272b4e0a831a..398c0863dfe87ee10b7aad953947e575ce1852ac 100644 (file)
--- a/config.default.php
+++ b/config.default.php
@@ -96,7 +96,7 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
 
        /* $show_voiced_gl_trans = 0, setting this to 1 will show the voided gl trans */
        $show_voided_gl_trans = 0;
-       
+
        /* use old style convert (income and expense in BS, PL) */
        $use_oldstyle_convert = 0;
 
@@ -145,7 +145,10 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
 
        /* suppress tax rates on documents. 0 = no, 1 = yes. */
        $suppress_tax_rates = 0;
-       
+
+       /* allow reopening closed transactions */
+       $allow_gl_reopen = 0;
+
        $dateformats    = array("MMDDYYYY", "DDMMYYYY", "YYYYMMDD","MmmDDYYYY", "DDMmmYYYY", "YYYYMmmDD");
        $dateseps               = array("/", ".", "-", " ");
        $thoseps                = array(",", ".", " ");
@@ -230,29 +233,6 @@ if(isset($_SESSION["wa_current_user"])) {
        // additional js source included in header
        $js_lib = $js_userlib = array();
 
-if (!defined('ICON_EDIT'))
-{
-       define("ICON_EDIT", "edit.gif");        
-       define("ICON_DELETE", "delete.gif");    
-       define("ICON_ADD", "ok.gif");   
-       define("ICON_UPDATE", "ok.gif");        
-       define("ICON_OK", "ok.gif");    
-       define("ICON_CANCEL", "cancel.png");    
-       define("ICON_GL", "gl.png");    
-       define("ICON_PRINT", "print.png");      
-       define("ICON_PDF", "pdf.gif");  
-       define("ICON_DOC", "invoice.gif");      
-       define("ICON_CREDIT", "credit.gif");    
-       define("ICON_RECEIVE", "receive.gif");  
-       define("ICON_DOWN", "download.gif");    
-       define("ICON_MONEY", "money.png");      
-       define("ICON_REMOVE", "remove.png");    
-       define("ICON_REPORT", "report.png");    
-       define("ICON_VIEW", "view.gif");        
-       define("ICON_SUBMIT", "ok.gif");
-       define("ICON_ESCAPE", "escape.png");    
-}
-
 /* 
        Display a dropdown select box for choosing Company to login if false.
        Show a blank editbox only if true where the Company NickName
@@ -282,7 +262,13 @@ $xr_providers = array("ECB", "YAHOO", "GOOGLE", "BLOOMBERG");
 $dflt_xr_provider = 0;
 
 /*
-       Optional sorting new sales documents lines according to item code
+       Set to true when remote service is authoritative source of exchange rates, and can be stored automatically without
+       manual edition. Otherwise exrate is stored on first new currency transaction of the day.
+*/
+$xr_provider_authoritative = false;
+
+/*
+       Optional sorting sales documents lines during edition according to item code
 */
 $sort_sales_items = false;