Merged changes form main trunk (2.2.8, 2.2.9)

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

diff --git a/config.default.php b/config.default.php
index f5edc7d2749087c76ca36f94f02547438359c9a6..44b0d8e252a21d39b6f085091cd4cde265bd6840 100644 (file)
--- a/config.default.php
+++ b/config.default.php
@@ -27,7 +27,7 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
        $error_logfile = dirname(__FILE__).'/tmp/errors.log';
        $debug                  = 1;
        $show_sql               = 0;
-       $go_debug               = 1;
+       $go_debug               = 0;
        $pdf_debug              = 0;
        // set $sql_trail to 1 only if you want to perform bugtracking sql trail
        // Warning: this produces huge amount of data in sql_trail table.
@@ -56,7 +56,9 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
        // Main Title
        $app_title = "FrontAccounting";
        // application version
-       $version                = "2.2 RC";
+       $version                = "2.3 CVS (m9)";
+        // src-data compatibility check. Do not change.
+       $core_version = "2.3";
 
        // Build for development purposes
        $build_version  = date("d.m.Y", filemtime("$path_to_root/CHANGELOG.txt"));
@@ -80,8 +82,14 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
        /* show users online discretely in the footer */
        $show_users_online = 0;
 
-       /* Integrated base Wiki Help URL or null if not used */
-       //$help_base_url = $path_to_root.'/modules/wiki/index.php?n='._('Help').'.';
+       // Wiki context help configuration
+       // If your help wiki use translated page titles uncomment next line
+       // $old_style_help = 1; // this setting is depreciated and subject to removal in next FA versions
+       //      locally installed wiki module
+       // $help_base_url = $path_to_root.'/modules/wiki/index.php?n='._('Help').'.';
+       //      context help feed from frontaccounting.net
+       // $help_base_url = 'http://frontaccounting.net/fawiki/index.php?n=Help.';
+       //      not used
        $help_base_url = null;
 
        /* per user data/cache directory */
@@ -91,7 +99,7 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
        $accounts_alpha = 0;
 
        /* Date systems. 0 = traditional, 1 = Jalali used by Iran, nabour countries, Afghanistan and some other Central Asian nations,
-       2 = Islamic used by other arabic nations */
+       2 = Islamic used by other arabic nations. 3 = traditional, but where non-workday is Friday and start of week is Saturday */
        $date_system = 0;
 
        /* email stock location if order below reorder-level */
@@ -100,20 +108,24 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
        /* print_invoice_no. 0 = print reference number, 1 = print invoice number */
        $print_invoice_no = 0;
 
+       /* 1 = print Subtotal tax excluded, tax and Total tax included */
+       $alternative_tax_include_on_docs = 0;
+
        $dateformats    = array("MMDDYYYY", "DDMMYYYY", "YYYYMMDD");
        $dateseps               = array("/", ".", "-", " ");
        $thoseps                = array(",", ".", " ");
        $decseps                = array(".", ",");
+       // defalt dateformats and dateseps indexes used before user login
+       $dflt_date_fmt = 0;
+       $dflt_date_sep = 0;
 
        $pagesizes              = array("Letter", "A4"); // default PDF pagesize
 
        /* Default border and spacing for tables */
        /* Should be moved to CSS */
 
-       if (!isset($_SESSION['bordercolor']))
-               $_SESSION['bordercolor'] = "#8cacbb";
-       $table_style    = "cellpadding=3 border=1 bordercolor='".$_SESSION['bordercolor']."' class='tablestyle'";
-       $table_style2   = "cellpadding=3 border=1 bordercolor='#cccccc' class='tablestyle2'";
+       $table_style    = "class='tablestyle'";
+       $table_style2   = "class='tablestyle2'";
 
        /* Accounts Payable */
        /* System check to see if quantity charged on purchase invoices exceeds the quantity received.
@@ -202,4 +214,5 @@ if (!defined('ICON_EDIT'))
        define("ICON_SUBMIT", "ok.gif");
        define("ICON_ESCAPE", "escape.png");    
 }
+
 ?>
\ No newline at end of file