X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fmanage%2Fexchange_rates.php;h=528b42030d6a74fde6a1c196f37c6e13a6cb22f9;hb=310a0d3ae5aeacbdaa0069546cc2652ac7518e6b;hp=02ba10c766c43f6be5d7ac5c504df91a1d45959a;hpb=a5242af68e65661edb7175412444dce536a7f311;p=fa-stable.git diff --git a/gl/manage/exchange_rates.php b/gl/manage/exchange_rates.php index 02ba10c7..528b4203 100644 --- a/gl/manage/exchange_rates.php +++ b/gl/manage/exchange_rates.php @@ -34,13 +34,7 @@ function check_data() 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) + if (input_num('BuyRate') <= 0) { display_error( _("The exchange rate cannot be zero or a negative number.")); set_focus('BuyRate'); @@ -134,10 +128,8 @@ function display_rate_edit() } if (isset($_POST['get_rate'])) { - $_POST['BuyRate'] = exrate_format(get_ecb_rate($_POST['curr_abrev'])); - if ($_POST['BuyRate'] == 0) { - display_error(_('This currency is not listed by ECB. Enter exchange rate manually.')); - } + $_POST['BuyRate'] = + exrate_format(retrieve_exrate($_POST['curr_abrev'], $_POST['date_'])); $Ajax->activate('BuyRate'); } small_amount_row(_("Exchange Rate:"), 'BuyRate', null, '', @@ -146,7 +138,7 @@ function display_rate_edit() end_table(1); - submit_add_or_update_center($selected_id == '', '', true); + submit_add_or_update_center($selected_id == '', '', 'both'); display_note(_("Exchange rates are entered against the company currency."), 1); } @@ -173,7 +165,7 @@ if ($Mode == 'Delete') //--------------------------------------------------------------------------------------------- -start_form(false, true); +start_form(); if (!isset($_POST['curr_abrev'])) $_POST['curr_abrev'] = get_global_curr_code();