Merged changes up to 2.3.16 into unstable

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

diff --git a/config.default.php b/config.default.php
index b0e8cc551fb649fa4d274d2c30706db2b6e06f27..5b6a0bc69e2edf57f9930ed10fea4c93cb0437b6 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(",", ".", " ");
@@ -232,25 +235,26 @@ if(isset($_SESSION["wa_current_user"])) {
 
 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_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");    
+       define("ICON_ESCAPE", "escape.png");
+       define("ICON_CLOSED", "closed.png");
 }
 
 /*