X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fmanage%2Fexchange_rates.php;h=6dfe221d9c88c8cecc53edc2139987a887eb1df8;hb=b32d16b2c0c6c43e569ebe87e2a13ceb892b5788;hp=deeb49b384a6a47e4719cc79890b86298a745339;hpb=0ad7b92c6cf2e4e65ca0fa94ba31f30f7b292ba8;p=fa-stable.git

diff --git a/gl/manage/exchange_rates.php b/gl/manage/exchange_rates.php
index deeb49b3..6dfe221d 100644
--- a/gl/manage/exchange_rates.php
+++ b/gl/manage/exchange_rates.php
@@ -18,7 +18,7 @@ page(_("Exchange Rates"), false, false, "", $js);
 if (isset($_GET['selected_id']))
 {
 	$selected_id = $_GET['selected_id'];
-} 
+}
 elseif (isset($_POST['selected_id']))
 {
 	$selected_id = $_POST['selected_id'];
@@ -28,19 +28,22 @@ else
 //---------------------------------------------------------------------------------------------
 function check_data()
 {
-	if (!is_date($_POST['date_'])) 
+	if (!is_date($_POST['date_']))
 	{
 		display_error( _("The entered date is invalid."));
+		set_focus('date_');
 		return false;
 	}
 	if (!check_num('BuyRate', 0))
 	{
 		display_error( _("The exchange rate must be numeric and greater than zero."));
+		set_focus('BuyRate');
 		return false;
 	}
 	if ($_POST['BuyRate'] <= 0)
 	{
 		display_error( _("The exchange rate cannot be zero or a negative number."));
+		set_focus('BuyRate');
 		return false;
 	}
 
@@ -56,13 +59,13 @@ function handle_submit()
 	if (!check_data())
 		return false;
 
-	if ($selected_id != "") 
+	if ($selected_id != "")
 	{
 
 		update_exchange_rate($_POST['curr_abrev'], $_POST['date_'],
 		 input_num('BuyRate'), input_num('BuyRate'));
-	} 
-	else 
+	}
+	else
 	{
 
 		add_exchange_rate($_POST['curr_abrev'], $_POST['date_'],
@@ -100,7 +103,7 @@ function display_rates($curr_code)
 
     $k = 0; //row colour counter
 
-    while ($myrow = db_fetch($result)) 
+    while ($myrow = db_fetch($result))
     {
 
    		alt_table_row_color($k);
@@ -128,8 +131,8 @@ function display_rate_edit()
 	if (isset($_POST['get_rate']))
 	{
 		$_POST['BuyRate'] = exrate_format(get_ecb_rate($_POST['curr_abrev']));
-	}	
-	if ($selected_id != "") 
+	}
+	if ($selected_id != "")
 	{
 		//editing an existing exchange rate
 
@@ -143,12 +146,13 @@ function display_rate_edit()
 		hidden('curr_abrev', $_POST['curr_abrev']);
 
 		label_row(_("Date to Use From:"), $_POST['date_']);
-	} 
-	else 
+	}
+	else
 	{
 		date_row(_("Date to Use From:"), 'date_');
 	}
-	small_amount_row(_("Exchange Rate:"), 'BuyRate', null, '', submit('get_rate',_("Get"), false));
+	small_amount_row(_("Exchange Rate:"), 'BuyRate', null, '',
+	  	submit('get_rate',_("Get"), false), user_exrate_dec());
 
 	end_table(1);
 
@@ -168,10 +172,10 @@ function clear_data()
 
 //---------------------------------------------------------------------------------------------
 
-if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM'])) 
+if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
 {
 
-	if (handle_submit()) 
+	if (handle_submit())
 	{
 		meta_forward($_SERVER['PHP_SELF']);
 	}
@@ -179,7 +183,7 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
 
 //---------------------------------------------------------------------------------------------
 
-if (isset($_GET['delete'])) 
+if (isset($_GET['delete']))
 {
 
 	handle_delete();
@@ -187,17 +191,18 @@ if (isset($_GET['delete']))
 
 //---------------------------------------------------------------------------------------------
 
-echo "<center>";
 start_form(false, true);
 
 if (!isset($_POST['curr_abrev']))
 	$_POST['curr_abrev'] = get_global_curr_code();
 
+echo "<center>";
 echo _("Select a currency :") . "  ";
 currencies_list('curr_abrev', $_POST['curr_abrev'], true);
+echo "</center>";
 
 // if currency sel has changed, clear the form
-if ($_POST['curr_abrev'] != get_global_curr_code()) 
+if ($_POST['curr_abrev'] != get_global_curr_code())
 {
 	clear_data();
 	$selected_id = "";
@@ -205,13 +210,13 @@ if ($_POST['curr_abrev'] != get_global_curr_code())
 
 set_global_curr_code($_POST['curr_abrev']);
 
-if (is_company_currency($_POST['curr_abrev'])) 
+if (is_company_currency($_POST['curr_abrev']))
 {
 
 	display_note(_("The selected currency is the company currency."), 2);
 	display_note(_("The company currency is the base currency so exchange rates cannot be set for it."), 1);
-} 
-else 
+}
+else
 {
 
     display_rates($_POST['curr_abrev']);