Fixes in sales reports to use debtor_trans.tax_included field instead of trans_tax_de...

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

diff --git a/gl/manage/gl_accounts.php b/gl/manage/gl_accounts.php
index 5a277c6ae0640d0f020f2317159d3cbee93c2a76..0ce1d5da8e385b5a4a0b7253354df5b151b6fef8 100644 (file)
--- a/gl/manage/gl_accounts.php
+++ b/gl/manage/gl_accounts.php
@@ -47,13 +47,13 @@ if (isset($_POST['add']) || isset($_POST['update']))
 
        $input_error = 0;
 
-       if (strlen($_POST['account_code']) == 0) 
+       if (strlen(trim($_POST['account_code'])) == 0) 
        {
                $input_error = 1;
                display_error( _("The account code must be entered."));
                set_focus('account_code');
        } 
-       elseif (strlen($_POST['account_name']) == 0) 
+       elseif (strlen(trim($_POST['account_name'])) == 0) 
        {
                $input_error = 1;
                display_error( _("The account name cannot be empty."));
@@ -76,7 +76,11 @@ if (isset($_POST['add']) || isset($_POST['update']))
 
        if ($selected_account) 
                {
-               if (update_gl_account($_POST['account_code'], $_POST['account_name'], 
+                       if (get_post('inactive') == 1 && is_bank_account($_POST['account_code']))
+                       {
+                               display_error(_("The account belongs to a bank account and cannot be inactivated."));
+                       }
+               elseif (update_gl_account($_POST['account_code'], $_POST['account_name'], 
                                $_POST['account_type'], $_POST['account_code2'])) {
                                update_record_status($_POST['account_code'], $_POST['inactive'],
                                        'chart_master', 'account_code');
@@ -106,61 +110,59 @@ function can_delete($selected_account)
 {
        if ($selected_account == "")
                return false;
-       $acc = db_escape($selected_account);
 
-       if (gl_account_in_transactions($acc))
+       if (key_in_foreign_table($selected_account, 'gl_trans', 'account'))
        {
                display_error(_("Cannot delete this account because transactions have been created using this account."));
                return false;
        }
 
-       if (gl_account_in_company_defaults($acc))
+       if (gl_account_in_company_defaults($selected_account))
        {
                display_error(_("Cannot delete this account because it is used as one of the company default GL accounts."));
                return false;
        }
-       
-       if (gl_account_in_bank_accounts($acc))
+
+       if (key_in_foreign_table($selected_account, 'bank_accounts', 'account_code'))
        {
                display_error(_("Cannot delete this account because it is used by a bank account."));
                return false;
-       }       
+       }
 
-       if (gl_account_in_stock_category($acc))
+       if (gl_account_in_stock_category($selected_account))
        {
                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))
+       }
+
+       if (gl_account_in_stock_master($selected_account))
        {
                display_error(_("Cannot delete this account because it is used by one or more Items."));
                return false;
-       }       
-       
-       if (gl_account_in_tax_types($acc))
+       }
+
+       if (gl_account_in_tax_types($selected_account))
        {
                display_error(_("Cannot delete this account because it is used by one or more Taxes."));
                return false;
-       }       
-       
-       if (gl_account_in_cust_branch($acc))
+       }
+
+       if (gl_account_in_cust_branch($selected_account))
        {
                display_error(_("Cannot delete this account because it is used by one or more Customer Branches."));
                return false;
-       }               
-       
-       if (gl_account_in_suppliers($acc))
+       }
+       if (gl_account_in_suppliers($selected_account))
        {
                display_error(_("Cannot delete this account because it is used by one or more suppliers."));
                return false;
-       }                                                                       
-       
-       if (gl_account_in_quick_entry_lines($acc))
+       }
+
+       if (gl_account_in_quick_entry_lines($selected_account))
        {
                display_error(_("Cannot delete this account because it is used by one or more Quick Entry Lines."));
                return false;
-       }                                                                       
+       }
 
        return true;
 }
@@ -188,7 +190,7 @@ start_form();
 
 if (db_has_gl_accounts()) 
 {
-       start_table("class = 'tablestyle_noborder'");
+       start_table(TABLESTYLE_NOBORDER);
        start_row();
     gl_all_accounts_list_cells(null, 'AccountList', null, false, false,
                _('New account'), true, check_value('show_inactive'));
@@ -202,7 +204,7 @@ if (db_has_gl_accounts())
 }
        
 br(1);
-start_table($table_style2);
+start_table(TABLESTYLE2);
 
 if ($selected_account != "") 
 {
@@ -234,10 +236,10 @@ else
                $_POST['account_name']  = $_POST['account_type'] = '';
                $_POST['inactive'] = 0;
        }
-       text_row_ex(_("Account Code:"), 'account_code', 11);
+       text_row_ex(_("Account Code:"), 'account_code', 15);
 }
 
-text_row_ex(_("Account Code 2:"), 'account_code2', 11);
+text_row_ex(_("Account Code 2:"), 'account_code2', 15);
 
 text_row_ex(_("Account Name:"), 'account_name', 60);