projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changes up to 2.3.7 merged into unstable branch.
[fa-stable.git]
/
gl
/
manage
/
gl_accounts.php
diff --git
a/gl/manage/gl_accounts.php
b/gl/manage/gl_accounts.php
index 9e5106806385c271b52d174b466a0b3fd976aca2..c47abcc8409fe41381a064165f632ab5c9a68609 100644
(file)
--- a/
gl/manage/gl_accounts.php
+++ b/
gl/manage/gl_accounts.php
@@
-76,7
+76,7
@@
if (isset($_POST['add']) || isset($_POST['update']))
if ($selected_account)
{
if ($selected_account)
{
- if (
check_value('inactive')
&& is_bank_account($_POST['account_code']))
+ if (
get_post('inactive') == 1
&& is_bank_account($_POST['account_code']))
{
display_error(_("The account belongs to a bank account and cannot be inactivated."));
}
{
display_error(_("The account belongs to a bank account and cannot be inactivated."));
}
@@
-110,61
+110,59
@@
function can_delete($selected_account)
{
if ($selected_account == "")
return false;
{
if ($selected_account == "")
return false;
- $acc = db_escape($selected_account);
- if (key_in_foreign_table($
acc
, 'gl_trans', 'account', true))
+ if (key_in_foreign_table($
selected_account
, 'gl_trans', 'account', true))
{
display_error(_("Cannot delete this account because transactions have been created using this account."));
return false;
}
{
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;
}
{
display_error(_("Cannot delete this account because it is used as one of the company default GL accounts."));
return false;
}
- if (key_in_foreign_table($
acc, 'bank_accounts', 'account_code', true))
+ if (key_in_foreign_table($
selected_account, 'bank_accounts', 'account_code', true))
{
display_error(_("Cannot delete this account because it is used by a bank account."));
return false;
{
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;
{
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;
{
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;
{
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;
{
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;
{
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;
{
display_error(_("Cannot delete this account because it is used by one or more Quick Entry Lines."));
return false;
- }
+ }
return true;
}
return true;
}