Additional fixes to last merge.

diff --git a/admin/db/company_db.inc b/admin/db/company_db.inc
index 1a01ec63e7200108ccbd8f37879837a81b0b6f09..bd9c4ea5d635587e2c74001281717d4d6231a465 100644 (file)
--- a/admin/db/company_db.inc
+++ b/admin/db/company_db.inc
@@ -68,7 +68,7 @@ function get_company_pref($prefs = null)
                return $ret;
 }
 
-function set_company_pref($pref, $category, $type, $length, $value)
+function get_company_prefs()
 {
        return get_company_pref(null);
 }

diff --git a/gl/includes/db/gl_db_accounts.inc b/gl/includes/db/gl_db_accounts.inc
index 904d1e6370263a573cf5a7791a3887fb34e2cdaf..921d53f1f5039172f7306be29aafcc895c75b7e7 100644 (file)
--- a/gl/includes/db/gl_db_accounts.inc
+++ b/gl/includes/db/gl_db_accounts.inc
@@ -205,92 +205,6 @@ function get_subaccount_name($code_id, $person_id)
        return  $row ? $row['ref'] : '';
 }
 
-       $myrow = db_fetch_row($result);
-       return ($myrow[0] > 0); 
-}
-
-function gl_account_in_stock_category($acc)
-{
-       $acc = db_escape($acc);
-
-       $sql= "SELECT COUNT(*) FROM ".TB_PREF."stock_category WHERE 
-               dflt_inventory_act=$acc 
-               OR dflt_cogs_act=$acc
-               OR dflt_adjustment_act=$acc 
-               OR dflt_sales_act=$acc";
-       $result = db_query($sql,"Couldn't test for existing stock category GL codes");
-
-       $myrow = db_fetch_row($result);
-       return ($myrow[0] > 0); 
-}
-
-function gl_account_in_stock_master($acc)
-{
-       $acc = db_escape($acc);
-
-       $sql= "SELECT COUNT(*) FROM ".TB_PREF."stock_master WHERE 
-               inventory_account=$acc 
-               OR cogs_account=$acc
-               OR adjustment_account=$acc 
-               OR sales_account=$acc";
-       $result = db_query($sql,"Couldn't test for existing stock GL codes");
-
-       $myrow = db_fetch_row($result);
-       return ($myrow[0] > 0); 
-}
-
-function gl_account_in_tax_types($acc)
-{
-       $acc = db_escape($acc);
-
-       $sql= "SELECT COUNT(*) FROM ".TB_PREF."tax_types WHERE sales_gl_code=$acc OR purchasing_gl_code=$acc";
-       $result = db_query($sql,"Couldn't test for existing tax GL codes");
-
-       $myrow = db_fetch_row($result);
-       return ($myrow[0] > 0); 
-}
-
-function gl_account_in_cust_branch($acc)
-{
-       $acc = db_escape($acc);
-
-       $sql= "SELECT COUNT(*) FROM ".TB_PREF."cust_branch WHERE 
-               sales_account=$acc 
-               OR sales_discount_account=$acc
-               OR receivables_account=$acc
-               OR payment_discount_account=$acc";
-       $result = db_query($sql,"Couldn't test for existing cust branch GL codes");
-
-       $myrow = db_fetch_row($result);
-       return ($myrow[0] > 0); 
-}
-
-function gl_account_in_suppliers($acc)
-{
-       $acc = db_escape($acc);
-
-       $sql= "SELECT COUNT(*) FROM ".TB_PREF."suppliers WHERE 
-               purchase_account=$acc
-               OR payment_discount_account=$acc
-               OR payable_account=$acc";
-       $result = db_query($sql,"Couldn't test for existing suppliers GL codes");
-
-       $myrow = db_fetch_row($result);
-       return ($myrow[0] > 0); 
-}
-
-function gl_account_in_quick_entry_lines($acc)
-{
-       $acc = db_escape($acc);
-
-       $sql= "SELECT COUNT(*) FROM ".TB_PREF."quick_entry_lines WHERE 
-               dest_id=$acc AND UPPER(LEFT(action, 1)) <> 'T'";
-       $result = db_query($sql,"Couldn't test for existing Quick Entry Line GL codes");
-
-       $myrow = db_fetch_row($result);
-       return ($myrow[0] > 0); 
-}
-
 function gl_account_in_bank_accounts($acc)
 {
        $sql= "SELECT COUNT(*) FROM ".TB_PREF."bank_accounts WHERE