Layout improvements

[fa-stable.git] / gl / includes / db / gl_db_accounts.inc

diff --git a/gl/includes/db/gl_db_accounts.inc b/gl/includes/db/gl_db_accounts.inc
index 279a55bee2fb93dd42b71a6b3c831cbd8a3900a2..f085cfe84b8cd767374cefed78ae142634b78f7a 100644 (file)
--- a/gl/includes/db/gl_db_accounts.inc
+++ b/gl/includes/db/gl_db_accounts.inc
@@ -34,7 +34,7 @@ function delete_gl_account($code)
        db_query($sql, "could not delete gl account");
 }
 
-function get_gl_accounts($from=null, $to=null)
+function get_gl_accounts($from=null, $to=null, $type=null)
 {
        $sql = "SELECT ".TB_PREF."chart_master.*,".TB_PREF."chart_types.name AS AccountTypeName
                FROM ".TB_PREF."chart_master,".TB_PREF."chart_types
@@ -43,31 +43,13 @@ function get_gl_accounts($from=null, $to=null)
                $sql .= " AND ".TB_PREF."chart_master.account_code >= ".db_escape($from);
        if ($to != null)
                $sql .= " AND ".TB_PREF."chart_master.account_code <= ".db_escape($to);
+       if ($type != null)
+               $sql .= " AND account_type=".db_escape($type);
        $sql .= " ORDER BY account_code";
 
        return db_query($sql, "could not get gl accounts");
 }
 
-function get_gl_accounts_all($balance=-1)
-{
-       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;                                 
-        $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);
@@ -106,22 +88,22 @@ function get_gl_account_name($code)
 
 function gl_account_in_company_defaults($acc)
 {
-       $sql= "SELECT COUNT(*) FROM ".TB_PREF."company WHERE debtors_act=$acc 
-               OR pyt_discount_act=$acc
-               OR creditors_act=$acc 
-               OR bank_charge_act=$acc 
-               OR exchange_diff_act=$acc
-               OR profit_loss_year_act=$acc
-               OR retained_earnings_act=$acc
-               OR freight_act=$acc
-               OR default_sales_act=$acc 
-               OR default_sales_discount_act=$acc
-               OR default_prompt_payment_act=$acc
-               OR default_inventory_act=$acc
-               OR default_cogs_act=$acc
-               OR default_adj_act=$acc
-               OR default_inv_sales_act=$acc
-               OR default_assembly_act=$acc";
+       $sql= "SELECT COUNT(*) FROM ".TB_PREF."sys_prefs WHERE (name='debtors_act' 
+               OR name='pyt_discount_act'
+               OR name='creditors_act' 
+               OR name='bank_charge_act' 
+               OR name='exchange_diff_act'
+               OR name='profit_loss_year_act'
+               OR name='retained_earnings_act'
+               OR name='freight_act'
+               OR name='default_sales_act' 
+               OR name='default_sales_discount_act'
+               OR name='default_prompt_payment_act'
+               OR name='default_inventory_act'
+               OR name='default_cogs_act'
+               OR name='default_adj_act'
+               OR name='default_inv_sales_act'
+               OR name='default_assembly_act') AND value=$acc";
        $result = db_query($sql,"Couldn't test for default company GL codes");
 
        $myrow = db_fetch_row($result);