if (isset($_GET['selected_id']))
{
$selected_id = $_GET['selected_id'];
-}
+}
elseif (isset($_POST['selected_id']))
{
$selected_id = $_POST['selected_id'];
else
$selected_id = "";
//---------------------------------------------------------------------------------------------
-
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 (!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."));
+ 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;
}
if (!check_data())
return false;
- if ($selected_id != "")
+ if ($selected_id != "")
{
- update_exchange_rate($_POST['curr_abrev'], $_POST['date_'], $_POST['BuyRate'],
- $_POST['BuyRate']);
- }
- else
+ 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;
$k = 0; //row colour counter
- while ($myrow = db_fetch($result))
+ while ($myrow = db_fetch($result))
{
alt_table_row_color($k);
if (isset($_POST['get_rate']))
{
- $_POST['BuyRate'] = get_ecb_rate($_POST['curr_abrev']);
- $_POST['BuyRate'] = number_format($_POST['BuyRate'], user_exrate_dec());
- }
- if ($selected_id != "")
+ $_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_']);
hidden('curr_abrev', $_POST['curr_abrev']);
label_row(_("Date to Use From:"), $_POST['date_']);
- }
- else
+ }
+ else
{
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"), false), user_exrate_dec());
end_table(1);
//---------------------------------------------------------------------------------------------
-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']);
}
//---------------------------------------------------------------------------------------------
-if (isset($_GET['delete']))
+if (isset($_GET['delete']))
{
handle_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 = "";
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']);