X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fmanage%2Fexchange_rates.php;h=49e924f6b41d0841d0d30239a3c9a21aaa531ebe;hb=44abddfd180ec27cbd889f4c8c8f8271f6d6d19d;hp=a22b71526814cb7dbb101ec1d4eba07c1172df1e;hpb=ebc600101ceab69c06eac4b1bd4d1782af45de05;p=fa-stable.git

diff --git a/gl/manage/exchange_rates.php b/gl/manage/exchange_rates.php
index a22b7152..49e924f6 100644
--- a/gl/manage/exchange_rates.php
+++ b/gl/manage/exchange_rates.php
@@ -26,7 +26,7 @@ page(_($help_context = "Exchange Rates"), false, false, "", $js);
 simple_page_mode(false);
 
 //---------------------------------------------------------------------------------------------
-function check_data()
+function check_data($selected_id)
 {
 	if (!is_date($_POST['date_']))
 	{
@@ -40,7 +40,12 @@ function check_data()
 		set_focus('BuyRate');
 		return false;
 	}
-
+	if (!$selected_id && get_date_exchange_rate($_POST['curr_abrev'], $_POST['date_']))
+	{
+		display_error( _("The exchange rate for the date is already there."));
+		set_focus('date_');
+		return false;
+	}
 	return true;
 }
 
@@ -50,7 +55,7 @@ function handle_submit()
 {
 	global $selected_id;
 
-	if (!check_data())
+	if (!check_data($selected_id))
 		return false;
 
 	if ($selected_id != "")
@@ -67,6 +72,7 @@ function handle_submit()
 	}
 
 	$selected_id = '';
+	clear_data();
 }
 
 //---------------------------------------------------------------------------------------------
@@ -79,6 +85,7 @@ function handle_delete()
 		return;
 	delete_exchange_rate($selected_id);
 	$selected_id = '';
+	clear_data();
 }
 
 //---------------------------------------------------------------------------------------------
@@ -94,7 +101,6 @@ function del_link($row)
 
 function display_rates($curr_code)
 {
-	global $table_style;
 
 }
 
@@ -102,9 +108,9 @@ function display_rates($curr_code)
 
 function display_rate_edit()
 {
-	global $selected_id, $table_style2, $Ajax;
-
-	start_table($table_style2);
+	global $selected_id, $Ajax, $xr_providers, $dflt_xr_provider;
+	$xchg_rate_provider = ((isset($xr_providers) && isset($dflt_xr_provider)) ? $xr_providers[$dflt_xr_provider] : 'ECB');
+	start_table(TABLESTYLE2);
 
 	if ($selected_id != "")
 	{
@@ -113,7 +119,7 @@ function display_rate_edit()
 		$myrow = get_exchange_rate($selected_id);
 
 		$_POST['date_'] = sql2date($myrow["date_"]);
-		$_POST['BuyRate'] = exrate_format($myrow["rate_buy"]);
+		$_POST['BuyRate'] = maxprec_format($myrow["rate_buy"]);
 
 		hidden('selected_id', $selected_id);
 		hidden('date_', $_POST['date_']);
@@ -129,12 +135,11 @@ function display_rate_edit()
 	if (isset($_POST['get_rate']))
 	{
 		$_POST['BuyRate'] = 
-			exrate_format(retrieve_exrate($_POST['curr_abrev'], $_POST['date_']));
+			maxprec_format(retrieve_exrate($_POST['curr_abrev'], $_POST['date_']));
 		$Ajax->activate('BuyRate');
 	}
-	small_amount_row(_("Exchange Rate:"), 'BuyRate', null, '',
-	  	submit('get_rate',_("Get"), false, _('Get current ECB rate') , true),
-		user_exrate_dec());
+	amount_row(_("Exchange Rate:"), 'BuyRate', null, '',
+	  	submit('get_rate',_("Get"), false, _('Get current rate from') . ' ' . $xchg_rate_provider , true), 'max');
 
 	end_table(1);
 
@@ -184,10 +189,7 @@ if ($_POST['curr_abrev'] != get_global_curr_code())
 
 set_global_curr_code($_POST['curr_abrev']);
 
-$sql = "SELECT date_, rate_buy, id FROM "
-	.TB_PREF."exchange_rates "
-	."WHERE curr_code=".db_escape($_POST['curr_abrev'])."
-	 ORDER BY date_ DESC";
+$sql = get_sql_for_exchange_rates();
 
 $cols = array(
 	_("Date to Use From") => 'date', 
@@ -208,6 +210,8 @@ else
 
 	br(1);
 	$table->width = "40%";
+	if ($table->rec_count == 0)
+		$table->ready = false;
 	display_db_pager($table);
    	br(1);
     display_rate_edit();