From 64e653e26f141e5d27cbb8fd730b97c0c43930df Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Fri, 5 Mar 2010 11:22:43 +0000 Subject: [PATCH] Release 2.2.7 Removed redundant variable $use_new_account_types from config.php Removed redundant function get_gl_accounts_all in gl_db_accounts. --- CHANGELOG.txt | 9 +++++++++ config.default.php | 5 +---- gl/includes/db/gl_db_accounts.inc | 25 ------------------------- update.html | 6 +++--- 4 files changed, 13 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 30549ad9..047accef 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,15 @@ Legend: ! -> Note $ -> Affected files +------------------------------- Release 2.2.7 ---------------------------------- +05-Mar-2010 Joe Hunt +! Release 2.2.7 +! Removed redundant variable $use_new_account_types from config.php +$ config.default.php + update.html +! Removed redundant function get_gl_accounts_all in gl_db_accounts.inc +$ /gl/includes/db/gl_db_accounts.inc + 02-Mar-2010 Joe Hunt # Bug sending email to a name with commas. Has been replaced with ''. $ /reporting/includes/pdf_report.inc diff --git a/config.default.php b/config.default.php index 7d72b9ba..3aa06942 100644 --- a/config.default.php +++ b/config.default.php @@ -56,7 +56,7 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_ // Main Title $app_title = "FrontAccounting"; // application version - $version = "2.2.6"; + $version = "2.2.7"; // Build for development purposes $build_version = date("d.m.Y", filemtime("$path_to_root/CHANGELOG.txt")); @@ -210,7 +210,4 @@ if (!defined('ICON_EDIT')) define("ICON_ESCAPE", "escape.png"); } - /* allow using of multi level sub-types when digits are of same length in account types */ - $use_new_account_types = 0; - ?> \ No newline at end of file diff --git a/gl/includes/db/gl_db_accounts.inc b/gl/includes/db/gl_db_accounts.inc index c3d2e978..70ef3236 100644 --- a/gl/includes/db/gl_db_accounts.inc +++ b/gl/includes/db/gl_db_accounts.inc @@ -50,31 +50,6 @@ function get_gl_accounts($from=null, $to=null, $type=null) return db_query($sql, "could not get gl accounts"); } -function get_gl_accounts_all($balance=-1) -{ - global $use_new_account_types; - - if ($balance == 1) - $where ="WHERE ctype>0 AND ctype<".CL_INCOME; - elseif ($balance == 0) - $where ="WHERE ctype>".CL_EQUITY." OR ctype=0"; // backwards compatibility - $sql = "SELECT ".TB_PREF."chart_master.account_code, ".TB_PREF."chart_master.account_name, ".TB_PREF."chart_master.account_code2, - ".TB_PREF."chart_types.name AS AccountTypeName,".TB_PREF."chart_types.id AS AccountType, - ".TB_PREF."chart_types.parent, ".TB_PREF."chart_class.class_name AS AccountClassName, ".TB_PREF."chart_class.cid AS ClassID, - ".TB_PREF."chart_class.ctype AS ClassType - FROM ".TB_PREF."chart_types INNER JOIN ".TB_PREF."chart_class ON ".TB_PREF."chart_types.class_id=".TB_PREF."chart_class.cid - LEFT JOIN ".TB_PREF."chart_master ON ".TB_PREF."chart_master.account_type=".TB_PREF."chart_types.id "; - if ($balance != -1) - $sql .= $where; - if (isset($use_new_account_types) && $use_new_account_types == 1) - $sql .= " ORDER BY ".TB_PREF."chart_class.cid, ".TB_PREF."chart_types.id, parent, ".TB_PREF."chart_master.account_code"; - else - $sql .= " ORDER BY ".TB_PREF."chart_class.cid, IF(parent > 0,parent,".TB_PREF."chart_types.id), - IF(parent > 0,".TB_PREF."chart_types.id, parent), ".TB_PREF."chart_master.account_code"; - - return db_query($sql, "could not get gl accounts"); -} - function get_gl_account($code) { $sql = "SELECT * FROM ".TB_PREF."chart_master WHERE account_code=".db_escape($code); diff --git a/update.html b/update.html index df509509..596ab68d 100644 --- a/update.html +++ b/update.html @@ -18,13 +18,13 @@ these files.
  • Upload all the new files. -
  • Look into the file, config.default.php and compare with your own config.php file. You should update the the following in your config.php:

  • Rename or remove the /install folder (you have already performed the install +
  • Look into the file, config.default.php and compare with your own config.php file. You should update the the following in your config.php:

  • Rename or remove the /install folder (you have already performed the install process earlier).
    -
  • You +
  • There are no database changes during a major and minor release. Like from 2.2 to 2.2.1 - 2.2.X .
  • If you are upgrading from an earlier installation you must immediately login on company 0, the first company you created, as admin (called the superadmin). If you use a theme other than the standard 3, @@ -35,7 +35,7 @@ to the 'Setup' tab and run 'Software Upgrade'. Mark the checkbox 'Install' and press 'Upgrade System'.  You must also do this if you upgrade from 2.2 Beta to 2.2 RC. This will -upgrade ALL your companies.
  • If something goes wrong during upgrade, you can enter here again and try 'Force Upgrade', and press 'Upgrade System' again.
  • There are no database changes during a major and minor release. Like from 2.2 to 2.2.1 - 2.2.X .
  • Enter +upgrade ALL your companies.
  • If something goes wrong during upgrade, you can enter here again and try 'Force Upgrade', and press 'Upgrade System' again.
  • Enter 'Setup' tab, 'System and Generel GL Setup'.  Set the correct Accounts for Retained Earnings, Profit/Loss Year and Bank Charge.
  • Enter 'Setup' tab, 'Access Setup'. Check all the roles and change as you -- 2.30.2