X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fmanage%2Fexchange_rates.php;h=77decb39f46c778501c961806e9754e7a24e6093;hb=0eadb0e7549a8e90af92dac51b560f57918084ac;hp=e2be27d991abccb52f6c76cc0909ccd2f59e2cba;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git

diff --git a/gl/manage/exchange_rates.php b/gl/manage/exchange_rates.php
index e2be27d9..77decb39 100644
--- a/gl/manage/exchange_rates.php
+++ b/gl/manage/exchange_rates.php
@@ -4,12 +4,15 @@ $page_security = 9;
 $path_to_root="../..";
 include_once($path_to_root . "/includes/session.inc");
 
-page(_("Exchange Rates"));
-
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/includes/banking.inc");
 
+$js = "";
+if ($use_date_picker)
+	$js .= get_js_date_picker();
+page(_("Exchange Rates"), false, false, "", $js);
+
 //---------------------------------------------------------------------------------------------
 
 if (isset($_GET['selected_id']))
@@ -23,7 +26,6 @@ elseif (isset($_POST['selected_id']))
 else
 	$selected_id = "";
 //---------------------------------------------------------------------------------------------
-
 function check_data()
 {
 	if (!is_date($_POST['date_'])) 
@@ -31,9 +33,9 @@ function check_data()
 		display_error( _("The entered date is invalid."));
 		return false;
 	}
-	if (!is_numeric($_POST['BuyRate']))
+	if (!check_num('BuyRate', 0))
 	{
-		display_error( _("The exchange rate must be numeric."));
+		display_error( _("The exchange rate must be numeric and greater than zero."));
 		return false;
 	}
 	if ($_POST['BuyRate'] <= 0)
@@ -57,14 +59,14 @@ function handle_submit()
 	if ($selected_id != "") 
 	{
 
-		update_exchange_rate($_POST['curr_abrev'], $_POST['date_'], $_POST['BuyRate'],
-			$_POST['BuyRate']);
+		update_exchange_rate($_POST['curr_abrev'], $_POST['date_'],
+		 input_num('BuyRate'), input_num('BuyRate'));
 	} 
 	else 
 	{
 
-		add_exchange_rate($_POST['curr_abrev'], $_POST['date_'], $_POST['BuyRate'],
-			$_POST['BuyRate']);
+		add_exchange_rate($_POST['curr_abrev'], $_POST['date_'],
+		    input_num('BuyRate'), input_num('BuyRate'));
 	}
 
 	return true;
@@ -125,17 +127,16 @@ function display_rate_edit()
 
 	if (isset($_POST['get_rate']))
 	{
-		$_POST['BuyRate'] = get_ecb_rate($_POST['curr_abrev']);
-		$_POST['BuyRate'] = number_format($_POST['BuyRate'], user_exrate_dec());
+		$_POST['BuyRate'] = exrate_format(get_ecb_rate($_POST['curr_abrev']));
 	}	
 	if ($selected_id != "") 
 	{
-		//editing an existing payment terms
+		//editing an existing exchange rate
 
 		$myrow = get_exchange_rate($selected_id);
 
 		$_POST['date_'] = sql2date($myrow["date_"]);
-		$_POST['BuyRate'] = $myrow["rate_buy"];
+		$_POST['BuyRate'] = exrate_format($myrow["rate_buy"]);
 
 		hidden('selected_id', $selected_id);
 		hidden('date_', $_POST['date_']);
@@ -147,7 +148,8 @@ function display_rate_edit()
 	{
 		date_row(_("Date to Use From:"), 'date_');
 	}
-	text_row(_("Exchange Rate:"), 'BuyRate', null, 15, 12, "", submit('get_rate',_("Get"), false));
+	small_amount_row(_("Exchange Rate:"), 'BuyRate', null, '', 
+	  submit('get_rate',_("Get")), user_exrate_dec());
 
 	end_table(1);