From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Sun, 14 Jun 2009 14:21:49 +0000 (+0000)
Subject: New variable in config.php, $use_oldstyle_convert, if set to 1, same convert as in... 
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=9f166d63c11a40a74d631b163257850edca26f6a;p=textcart.git

New variable in config.php, $use_oldstyle_convert, if set to 1, same convert as in old versions.
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 2e869c1..f5ab184 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -23,9 +23,12 @@ $ -> Affected files
 ! Much better presentation of new Balance Sheet, P&L Statement and Monthly Breakdown.
 $ /gl/includes/db/gl_db_account_types.inc
   /gl/includes/db/gl_db_accounts.inc
+  /includes/types.inc
   /reporting/rep705.php
   /reporting/rep706.php
   /reporting/rep707.php
+! New variable in config.php, $use_oldstyle_convert, if set to 1, same convert as in old versions.  
+$ config.php
   
 13-Jun-2009 Joe Hunt/Pete/Tom Moulton
 ! Changed next reference method to also include partly alpha characters in front, fi. WA036 increments to WA037
diff --git a/config.php b/config.php
index d27448c..c3e0d68 100644
--- a/config.php
+++ b/config.php
@@ -64,6 +64,9 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
 	/* use Audit Trails in GL */
 	$use_audit_trail = 0;
 
+	/* use old style convert (income and expense in BS, PL) */
+	$use_oldstyle_convert = 0;
+
  	/* Integrated base Wiki Help URL or null if not used */
 	//$help_base_url = $path_to_root.'/modules/wiki/index.php?n='._('Help').'.';
 	$help_base_url = null;
diff --git a/includes/types.inc b/includes/types.inc
index e12efa0..8bf64e9 100644
--- a/includes/types.inc
+++ b/includes/types.inc
@@ -309,6 +309,7 @@ class wo_types
 	}
 }
 
+define('CL_NONE', 0); // for backward compatibility
 define('CL_ASSETS', 1);
 define('CL_LIABILITIES', 2);
 define('CL_EQUITY', 3);
@@ -325,6 +326,14 @@ $class_types = array(
 		CL_EXPENSE => _("Expense"),
 );
 
+function get_class_type_convert($ctype)
+{
+	global $use_oldstyle_convert;
+	if (isset($use_oldstyle_convert) && $use_oldstyle_convert == 1)
+		return (($ctype >= CL_INCOME || $ctype == CL_NONE) ? -1 : 1);
+	else	
+		return ((($ctype >= CL_LIABILITIES && $ctype <= CL_INCOME) || $ctype == CL_NONE) ? -1 : 1);
+}
 define('WO_LABOUR', 0);
 define('WO_OVERHEAD', 1);
 
diff --git a/reporting/rep705.php b/reporting/rep705.php
index 610a82b..a9ca35e 100644
--- a/reporting/rep705.php
+++ b/reporting/rep705.php
@@ -285,7 +285,7 @@ function print_annual_expense_breakdown()
 		}
 		$classname = $account['AccountClassName'];
 		$ctype = $account['ClassType'];
-		$convert = (($ctype == CL_INCOME || $ctype == 0) ? -1 : 1); // backwards compatibility
+		$convert = get_class_type_convert($ctype); 
 
 		if ($account['account_code'] != null)
 		{
diff --git a/reporting/rep706.php b/reporting/rep706.php
index a8c64ec..3f09f5c 100644
--- a/reporting/rep706.php
+++ b/reporting/rep706.php
@@ -236,7 +236,7 @@ function print_balance_sheet()
 		}
 		$classname = $account['AccountClassName'];
 		$ctype = $account['ClassType'];
-		$convert = (($ctype == CL_LIABILITIES || $ctype == CL_EQUITY || $ctype == 0) ? -1 : 1); // backwards compatibility
+		$convert = get_class_type_convert($ctype); 
 
 		if ($account['account_code'] != null)
 		{
diff --git a/reporting/rep707.php b/reporting/rep707.php
index 7ce02b2..e19c29f 100644
--- a/reporting/rep707.php
+++ b/reporting/rep707.php
@@ -251,8 +251,8 @@ function print_profit_and_loss_statement()
 		}
 		$classname = $account['AccountClassName'];
 		$ctype = $account['ClassType'];
-		$convert = (($ctype == CL_INCOME || $ctype == 0) ? -1 : 1); // backwards compatibility
-
+		$convert = get_class_type_convert($ctype); 
+		
 		if ($account['account_code'] != null)
 		{
 			//$per_balance *= -1;