X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fmanage%2Fcurrencies.php;h=b14b79fde4c4e7a4114a73e008a51b93fd107812;hb=3ef43955f694fce651c79236e63e7a3ada5620d5;hp=99f80bdd2ccab620708c53d4f5f5fc0fad98e35f;hpb=0bf933423b9645bcb57390c478d4fdaf0c895049;p=fa-stable.git

diff --git a/gl/manage/currencies.php b/gl/manage/currencies.php
index 99f80bdd..b14b79fd 100644
--- a/gl/manage/currencies.php
+++ b/gl/manage/currencies.php
@@ -89,26 +89,26 @@ function check_can_delete()
 	$curr = db_escape($selected_id);
 
 	// PREVENT DELETES IF DEPENDENT RECORDS IN debtors_master
-	if (currency_in_debtors($curr))
+	if (key_in_foreign_table($curr, 'debtors_master', 'curr_code', true))
 	{
 		display_error(_("Cannot delete this currency, because customer accounts have been created referring to this currency."));
 		return false;
 	}
 
-	if (currency_in_suppliers($curr))
+	if (key_in_foreign_table($curr, 'suppliers', 'curr_code', true))
 	{
 		display_error(_("Cannot delete this currency, because supplier accounts have been created referring to this currency."));
 		return false;
 	}
-	
-	if (currency_in_company($curr))
+
+	if ($curr == get_company_pref('curr_default'))
 	{
 		display_error(_("Cannot delete this currency, because the company preferences uses this currency."));
 		return false;
 	}
 	
 	// see if there are any bank accounts that use this currency
-	if (currenty_in_bank_accounts($curr))
+	if (key_in_foreign_table($curr, 'bank_accounts', 'bank_curr_code', true))
 	{
 		display_error(_("Cannot delete this currency, because thre are bank accounts that use this currency."));
 		return false;
@@ -134,12 +134,10 @@ function handle_delete()
 
 function display_currencies()
 {
-	global $table_style;
-
 	$company_currency = get_company_currency();
 	
     $result = get_currencies(check_value('show_inactive'));
-    start_table($table_style);
+    start_table(TABLESTYLE);
     $th = array(_("Abbreviation"), _("Symbol"), _("Currency Name"),
     	_("Hundredths name"), _("Country"), _("Auto update"), "", "");
 	inactive_control_column($th);
@@ -183,9 +181,9 @@ function display_currencies()
 
 function display_currency_edit($selected_id)
 {
-	global $table_style2, $Mode;
+	global $Mode;
 	
-	start_table($table_style2);
+	start_table(TABLESTYLE2);
 
 	if ($selected_id != '') 
 	{