Merged changes from main trunk up to 2.2.5

[fa-stable.git] / gl / manage / gl_accounts.php

diff --git a/gl/manage/gl_accounts.php b/gl/manage/gl_accounts.php
index 02a78bc763bf8c5e37a55cfbb1a8b71081001416..7b1937fdbc1f7a79c3d62d9c98580a13e105cfdf 100644 (file)
--- a/gl/manage/gl_accounts.php
+++ b/gl/manage/gl_accounts.php
@@ -13,7 +13,7 @@ $page_security = 'SA_GLACCOUNT';
 $path_to_root = "../..";
 include($path_to_root . "/includes/session.inc");
 
-page(_("Chart of Accounts"));
+page(_($help_context = "Chart of Accounts"));
 
 include($path_to_root . "/includes/ui.inc");
 include($path_to_root . "/gl/includes/gl_db.inc");
@@ -71,6 +71,9 @@ if (isset($_POST['add']) || isset($_POST['update']))
                if ($accounts_alpha == 2)
                        $_POST['account_code'] = strtoupper($_POST['account_code']);
 
+               if (!isset($_POST['account_tags']))
+                       $_POST['account_tags'] = array();
+
        if ($selected_account) 
                {
                if (update_gl_account($_POST['account_code'], $_POST['account_name'], 
@@ -103,104 +106,57 @@ function can_delete($selected_account)
 {
        if ($selected_account == "")
                return false;
-       $sql= "SELECT COUNT(*) FROM ".TB_PREF."gl_trans WHERE account='$selected_account'";
-       $result = db_query($sql,"Couldn't test for existing transactions");
+       $acc = db_escape($selected_account);
 
-       $myrow = db_fetch_row($result);
-       if ($myrow[0] > 0) 
+       if (key_in_foreign_table($acc, 'gl_trans', 'account', true))
        {
                display_error(_("Cannot delete this account because transactions have been created using this account."));
                return false;
        }
 
-       $sql= "SELECT COUNT(*) FROM ".TB_PREF."company WHERE debtors_act='$selected_account' 
-               OR pyt_discount_act='$selected_account' 
-               OR creditors_act='$selected_account' 
-               OR freight_act='$selected_account'
-               OR default_sales_act='$selected_account' 
-               OR default_sales_discount_act='$selected_account'
-               OR default_prompt_payment_act='$selected_account'
-               OR default_inventory_act='$selected_account'
-               OR default_cogs_act='$selected_account'
-               OR default_adj_act='$selected_account'
-               OR default_inv_sales_act='$selected_account'
-               OR default_assembly_act='$selected_account'";
-       $result = db_query($sql,"Couldn't test for default company GL codes");
-
-       $myrow = db_fetch_row($result);
-       if ($myrow[0] > 0) 
+       if (gl_account_in_company_defaults($acc))
        {
                display_error(_("Cannot delete this account because it is used as one of the company default GL accounts."));
                return false;
        }
-       
-       $sql= "SELECT COUNT(*) FROM ".TB_PREF."bank_accounts WHERE account_code='$selected_account'";
-       $result = db_query($sql,"Couldn't test for bank accounts");
 
-       $myrow = db_fetch_row($result);
-       if ($myrow[0] > 0) 
+       if (key_in_foreign_table($acc, 'bank_accounts', 'account_code', true))  
        {
                display_error(_("Cannot delete this account because it is used by a bank account."));
                return false;
        }       
 
-       $sql= "SELECT COUNT(*) FROM ".TB_PREF."stock_master WHERE 
-               inventory_account='$selected_account' 
-               OR cogs_account='$selected_account'
-               OR adjustment_account='$selected_account' 
-               OR sales_account='$selected_account'";
-       $result = db_query($sql,"Couldn't test for existing stock GL codes");
-
-       $myrow = db_fetch_row($result);
-       if ($myrow[0] > 0) 
+       if (gl_account_in_stock_category($acc))
+       {
+               display_error(_("Cannot delete this account because it is used by one or more Item Categories."));
+               return false;
+       }       
+       
+       if (gl_account_in_stock_master($acc))
        {
                display_error(_("Cannot delete this account because it is used by one or more Items."));
                return false;
        }       
        
-       $sql= "SELECT COUNT(*) FROM ".TB_PREF."tax_types WHERE sales_gl_code='$selected_account' OR purchasing_gl_code='$selected_account'";
-       $result = db_query($sql,"Couldn't test for existing tax GL codes");
-
-       $myrow = db_fetch_row($result);
-       if ($myrow[0] > 0) 
+       if (gl_account_in_tax_types($acc))
        {
                display_error(_("Cannot delete this account because it is used by one or more Taxes."));
                return false;
        }       
        
-       $sql= "SELECT COUNT(*) FROM ".TB_PREF."cust_branch WHERE 
-               sales_account='$selected_account' 
-               OR sales_discount_account='$selected_account'
-               OR receivables_account='$selected_account'
-               OR payment_discount_account='$selected_account'";
-       $result = db_query($sql,"Couldn't test for existing cust branch GL codes");
-
-       $myrow = db_fetch_row($result);
-       if ($myrow[0] > 0) 
+       if (gl_account_in_cust_branch($acc))
        {
                display_error(_("Cannot delete this account because it is used by one or more Customer Branches."));
                return false;
        }               
        
-       $sql= "SELECT COUNT(*) FROM ".TB_PREF."suppliers WHERE 
-               purchase_account='$selected_account' 
-               OR payment_discount_account='$selected_account' 
-               OR payable_account='$selected_account'";
-       $result = db_query($sql,"Couldn't test for existing suppliers GL codes");
-
-       $myrow = db_fetch_row($result);
-       if ($myrow[0] > 0) 
+       if (gl_account_in_suppliers($acc))
        {
                display_error(_("Cannot delete this account because it is used by one or more suppliers."));
                return false;
        }                                                                       
        
-       $sql= "SELECT COUNT(*) FROM ".TB_PREF."quick_entry_lines WHERE 
-               dest_id='$selected_account' AND UPPER(LEFT(action, 1)) <> 'T'";
-       $result = db_query($sql,"Couldn't test for existing suppliers GL codes");
-
-       $myrow = db_fetch_row($result);
-       if ($myrow[0] > 0) 
+       if (gl_account_in_quick_entry_lines($acc))
        {
                display_error(_("Cannot delete this account because it is used by one or more Quick Entry Lines."));
                return false;
@@ -294,11 +250,11 @@ end_table(1);
 
 if ($selected_account == "") 
 {
-       submit_center('add', _("Add Account"), true, '', false);
+       submit_center('add', _("Add Account"), true, '', 'default');
 } 
 else 
 {
-    submit_center_first('update', _("Update Account"), '', false);
+    submit_center_first('update', _("Update Account"), '', 'default');
     submit_center_last('delete', _("Delete account"), '',true);
 }
 end_form();