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

diff --git a/gl/manage/currencies.php b/gl/manage/currencies.php
index 99f80bdd..971dbf3b 100644
--- a/gl/manage/currencies.php
+++ b/gl/manage/currencies.php
@@ -80,35 +80,33 @@ function handle_submit()
 
 //---------------------------------------------------------------------------------------------
 
-function check_can_delete()
+function check_can_delete($curr)
 {
-	global $selected_id;
-		
-	if ($selected_id == "")
+
+	if ($curr == "")
 		return false;
-	$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'))
 	{
 		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'))
 	{
 		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'))
 	{
 		display_error(_("Cannot delete this currency, because thre are bank accounts that use this currency."));
 		return false;
@@ -122,7 +120,7 @@ function check_can_delete()
 function handle_delete()
 {
 	global $selected_id, $Mode;
-	if (check_can_delete()) {
+	if (check_can_delete($selected_id)) {
 	//only delete if used in neither customer or supplier, comp prefs, bank trans accounts
 		delete_currency($selected_id);
 		display_notification(_('Selected currency has been deleted'));
@@ -134,12 +132,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 +179,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 != '') 
 	{
@@ -248,4 +244,3 @@ end_form();
 
 end_page();
 
-?>