Changed balance_sheet field in account class to ctype and fixed class editing.

Parse error in ui_lists.inc. Masked include_once(/validation.inc) in main.inc.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index eeb8e93a25732de3f69d2f36d716a76ce8e3d9fa..17ce0ebe3877b0bc7c3dca354f566a44abb164ff 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,19 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+25-Jun-2009 Joe Hunt
+! Changed balance_sheet field in account class to ctype and fixed class editing.
+# Parse error in ui_lists.inc. Masked include_once(/validation.inc) in main.inc.
+$ /admin/fiscalyears.php
+  /gl/includes/db/gl_db_accounts.inc
+  /gl/includes/db/gl_db_account_types.inc
+  /gl/includes/db/gl_db_trans.inc
+  /gl/manage/gl_account_classes.php
+  /includes/main.inc
+  /includes/ui/ui_lists.inc
+  /sql/en_US-demo.sql
+  /sql/alter2.2.sql
+  
 25-Jun-2009 Janusz Dobrowolski
 ! Merged changes from main trunk  2.1.2-2.1.3 (see below)
 $ /admin/backups.php

diff --git a/admin/fiscalyears.php b/admin/fiscalyears.php
index 6ab8da04957f0eaf493b22b0c3a3e53d2e9b1a5b..3df3205fa84d96e457bee748395cc8006e75de6e 100644 (file)
--- a/admin/fiscalyears.php
+++ b/admin/fiscalyears.php
@@ -90,7 +90,7 @@ function close_year($year)
        // retrieve total balances from balance sheet accounts
     $sql = "SELECT SUM(amount) FROM ".TB_PREF."gl_trans INNER JOIN ".TB_PREF."chart_master ON account=account_code
        INNER JOIN ".TB_PREF."chart_types ON account_type=id INNER JOIN ".TB_PREF."chart_class ON class_id=cid 
-               WHERE balance_sheet=1 AND tran_date <= '$to'";
+               WHERE ctype>=".CL_ASSETS." AND ctype <=".CL_EQUITY." AND tran_date <= '$to'";
        $result = db_query($sql, "The total balance could not be calculated");
 
        $row = db_fetch_row($result);

diff --git a/config.php b/config.php
index 52f10e6fe516be03c12e7345ea2bf73bd950e560..a25d938dbeaeab857470be5c510f080945c4d68a 100644 (file)
--- a/config.php
+++ b/config.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               = 0;
+       $go_debug               = 1;
        $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.

diff --git a/gl/includes/db/gl_db_account_types.inc b/gl/includes/db/gl_db_account_types.inc
index 80d4fe3ad3d01af83171467b5b7733d14afde8ce..25049c43edb9e907c5e6ced6d0b4b1757d91d087 100644 (file)
--- a/gl/includes/db/gl_db_account_types.inc
+++ b/gl/includes/db/gl_db_account_types.inc
@@ -61,18 +61,18 @@ function delete_account_type($id)
        db_query($sql, "could not delete account type");
 }
 
-function add_account_class($id, $name, $balance, $sign_conv)
+function add_account_class($id, $name, $ctype)
 {
-       $sql = "INSERT INTO ".TB_PREF."chart_class (cid, class_name, balance_sheet, sign_convert)
-               VALUES ($id, ".db_escape($name).", $balance, $sign_conv)";
+       $sql = "INSERT INTO ".TB_PREF."chart_class (cid, class_name, ctype)
+               VALUES ($id, ".db_escape($name).", $ctype)";
 
        db_query($sql, "could not add account type");
 }
 
-function update_account_class($id, $name, $balance, $sign_conv)
+function update_account_class($id, $name, $ctype)
 {
     $sql = "UPDATE ".TB_PREF."chart_class SET class_name=".db_escape($name).",
-               balance_sheet=$balance, sign_convert=$sign_conv WHERE cid = $id";
+               ctype=$ctype WHERE cid = $id";
 
        db_query($sql, "could not update account type");
 }

diff --git a/gl/includes/db/gl_db_accounts.inc b/gl/includes/db/gl_db_accounts.inc
index 414ad8e277f727c92035c807c25051bba7ee691d..eb61b1c743c9e286d09af40d1df6777e0970a9db 100644 (file)
--- a/gl/includes/db/gl_db_accounts.inc
+++ b/gl/includes/db/gl_db_accounts.inc
@@ -52,12 +52,12 @@ function get_gl_accounts($from=null, $to=null)
 function get_gl_accounts_all($balance=-1)
 {
        if ($balance == 1)
-               $where ="WHERE balance_sheet>0 AND balance_sheet<".CL_INCOME;
+               $where ="WHERE ctype>0 AND ctype<".CL_INCOME;
        elseif ($balance == 0)  
-               $where ="WHERE balance_sheet>".CL_EQUITY." OR balance_sheet=0"; // backwards compatibility
+               $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_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.balance_sheet AS ClassType
+               ".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)
@@ -78,7 +78,7 @@ function get_gl_account($code)
 
 function is_account_balancesheet($code)
 {
-       $sql = "SELECT ".TB_PREF."chart_class.balance_sheet FROM ".TB_PREF."chart_class, ".TB_PREF."chart_types, ".TB_PREF."chart_master
+       $sql = "SELECT ".TB_PREF."chart_class.ctype FROM ".TB_PREF."chart_class, ".TB_PREF."chart_types, ".TB_PREF."chart_master
                WHERE ".TB_PREF."chart_master.account_type=".TB_PREF."chart_types.id AND
                ".TB_PREF."chart_types.class_id=".TB_PREF."chart_class.cid
                AND ".TB_PREF."chart_master.account_code='$code'";

diff --git a/gl/includes/db/gl_db_trans.inc b/gl/includes/db/gl_db_trans.inc
index d80dfe4789c1b627386a55041678fce79732f223..5b559d33987a094334242f3620f30f066c3c45a3 100644 (file)
--- a/gl/includes/db/gl_db_trans.inc
+++ b/gl/includes/db/gl_db_trans.inc
@@ -215,7 +215,7 @@ function get_balance($account, $dimension, $dimension2, $from, $to, $from_incl=t
        if ($from_incl)
                $sql .= " tran_date >= '$from_date'  AND";
        else
-               $sql .= " tran_date > IF(balance_sheet>0 AND balance_sheet<".CL_INCOME.", '0000-00-00', '$from_date') AND";
+               $sql .= " tran_date > IF(ctype>0 AND ctype<".CL_INCOME.", '0000-00-00', '$from_date') AND";
        $to_date = date2sql($to);
        if ($to_incl)
                $sql .= " tran_date <= '$to_date' ";

diff --git a/gl/manage/gl_account_classes.php b/gl/manage/gl_account_classes.php
index 7df38e2c4e65eca630e37df3b67bbc17b951435c..29b6eb3e63870ed4fabe0f8df0fb9909cb7cbca7 100644 (file)
--- a/gl/manage/gl_account_classes.php
+++ b/gl/manage/gl_account_classes.php
@@ -50,12 +50,12 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
 
        if ($selected_id != -1) 
        {
-               update_account_class($selected_id, $_POST['name'], $_POST['Balance'], $_POST['convert']);
+               update_account_class($selected_id, $_POST['name'], $_POST['ctype']);
                        display_notification(_('Selected account class settings has been updated'));
        } 
        else 
        {
-               add_account_class($_POST['id'], $_POST['name'], $_POST['Balance'], $_POST['convert']);
+               add_account_class($_POST['id'], $_POST['name'], $_POST['ctype']);
                        display_notification(_('New account class has been added'));
        }
                $Mode = 'RESET';
@@ -99,7 +99,7 @@ if ($Mode == 'Delete')
 if ($Mode == 'RESET')
 {
        $selected_id = -1;
-       $_POST['id']  = $_POST['name']  = $_POST['Balance'] = $_POST['sign_convert'] = '';
+       $_POST['id']  = $_POST['name']  = $_POST['ctype'] =  '';
 }
 //-----------------------------------------------------------------------------------
 
@@ -119,7 +119,7 @@ while ($myrow = db_fetch($result))
 
        label_cell($myrow["cid"]);
        label_cell($myrow['class_name']);
-       label_cell($class_types[$myrow["balance_sheet"]]);
+       label_cell($class_types[$myrow["ctype"]]);
        inactive_control_cell($myrow["cid"], $myrow["inactive"], 'chart_class', 'cid');
        edit_button_cell("Edit".$myrow["cid"], _("Edit"));
        delete_button_cell("Delete".$myrow["cid"], _("Delete"));
@@ -139,8 +139,7 @@ if ($selected_id != -1)
 
        $_POST['id']  = $myrow["cid"];
        $_POST['name']  = $myrow["class_name"];
-       $_POST['Balance']  = $myrow["balance_sheet"];
-       $_POST['convert']  = $myrow["sign_convert"];
+       $_POST['ctype']  = $myrow["ctype"];
        hidden('selected_id', $selected_id);
  }
        hidden('id');
@@ -155,9 +154,7 @@ else
 
 text_row_ex(_("Class Name:"), 'name', 50, 60);
 
-class_types_list_row(_("Class Type:"), 'Balance', null);
-
-yesno_list_row(_("Sign Convert (Balance Sheet/PL statement):"), 'convert', null, "", "", false);
+class_types_list_row(_("Class Type:"), 'ctype', null);
 
 end_table(1);
 

diff --git a/includes/main.inc b/includes/main.inc
index e45f5973856f65c3dd4b55ca3036bac4963f4fd8..b1876099aff2346b8b4020a189cdb296697e190d 100644 (file)
--- a/includes/main.inc
+++ b/includes/main.inc
@@ -20,7 +20,7 @@ include_once($path_to_root . "/includes/prefs/sysprefs.inc");
 include_once($path_to_root . "/includes/db/comments_db.inc");
 include_once($path_to_root . "/includes/db/sql_functions.inc");
 include_once($path_to_root . "/includes/db/audit_trail_db.inc");
-include_once($path_to_root . "/includes/validation.inc");
+//include_once($path_to_root . "/includes/validation.inc");
 
 include_once($path_to_root . "/admin/db/users_db.inc");
 include_once($path_to_root . "/includes/ui/ui_view.inc");

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 0076a14539d69a92d31ce5b13ec0efa2860a637a..bd411303ce3f9571ef0443882ec2f160a532f4c9 100644 (file)
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -68,7 +68,7 @@ $opts = array(                // default options
        if (!is_array($opts['where']))  $opts['where'] = array($opts['where']);
 
        $search_box = $opts['search_box']===true ? '_'.$name.'_edit' : $opts['search_box'];
-       $search_submit = $opts['search_submit']]===true ? '_'.$name.'_button' : $opts['search_submit'];
+       $search_submit = $opts['search_submit']===true ? '_'.$name.'_button' : $opts['search_submit'];
        $select_submit =  $opts['select_submit']===true ? '_'.$name.'_update' : $opts['select_submit'];
        $spec_id = $opts['spec_id'];
        $spec_option = $opts['spec_option'];

diff --git a/sql/alter2.2.sql b/sql/alter2.2.sql
index a8de33958897e597c4c93751912c946392eb5ab2..3703d0eadfb8c900f327f77baea0f69bba41b6d5 100644 (file)
--- a/sql/alter2.2.sql
+++ b/sql/alter2.2.sql
@@ -35,8 +35,8 @@ ALTER TABLE `0_users` ADD COLUMN `sticky_doc_date` TINYINT(1) DEFAULT '0';
 ALTER TABLE `0_debtors_master` MODIFY COLUMN `name` varchar(100) NOT NULL default '';
 ALTER TABLE `0_cust_branch` ADD COLUMN `inactive` tinyint(1) NOT NULL default '0';
 
-#ALTER TABLE `0_chart_class` ADD COLUMN `sign_convert` tinyint(1) NOT NULL default '0';
-#UPDATE `0_chart_class` SET `sign_convert`=1 WHERE `cid`=3 OR `cid`=4 OR `cid`=5;
+ALTER TABLE `0_chart_class` DROP COLUMN `sign_convert`;
+ALTER TABLE `0_chart_class` CHANGE `balance_sheet` `ctype` TINYINT(1) NOT NULL DEFAULT '0';
 
 ALTER TABLE `0_chart_class` ADD COLUMN `inactive` tinyint(1) NOT NULL default '0';
 ALTER TABLE `0_chart_types` ADD COLUMN `inactive` tinyint(1) NOT NULL default '0';

diff --git a/sql/en_US-demo.sql b/sql/en_US-demo.sql
index 3d678d41f22d60622bba239e86dbb5e5409d2edc..70210023d3c1407e37117f03573cee5e7e449573 100644 (file)
--- a/sql/en_US-demo.sql
+++ b/sql/en_US-demo.sql
@@ -195,8 +195,7 @@ DROP TABLE IF EXISTS `0_chart_class`;
 CREATE TABLE `0_chart_class` (
   `cid` int(11) NOT NULL default '0',
   `class_name` varchar(60) NOT NULL default '',
-  `balance_sheet` tinyint(1) NOT NULL default '0',
-  `sign_convert` tinyint(1) NOT NULL default '0',
+  `ctype` tinyint(1) NOT NULL default '0',
   `inactive` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`cid`)
 ) TYPE=MyISAM  ;
@@ -204,10 +203,10 @@ CREATE TABLE `0_chart_class` (
 
 ### Data of table `0_chart_class` ###
 
-INSERT INTO `0_chart_class` VALUES ('1', 'Assets', '1', '0', '0');
-INSERT INTO `0_chart_class` VALUES ('2', 'Liabilities', '1', '0', '0');
-INSERT INTO `0_chart_class` VALUES ('3', 'Income', '0', '1', '0');
-INSERT INTO `0_chart_class` VALUES ('4', 'Costs', '0', '1', '0');
+INSERT INTO `0_chart_class` VALUES ('1', 'Assets', '1', '0');
+INSERT INTO `0_chart_class` VALUES ('2', 'Liabilities', '2', '0');
+INSERT INTO `0_chart_class` VALUES ('3', 'Income', '4', '0');
+INSERT INTO `0_chart_class` VALUES ('4', 'Costs', '6', '0');
 
 
 ### Structure of table `0_chart_master` ###