X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fmanage%2Fexchange_rates.php;h=05953c04bd452d77714077edc71d386fe1b7cc18;hb=9451db1760036985de791ba24c442801e37f37de;hp=e7a7f574cfa92f7a39072add3c6f0d5705e8cb76;hpb=f0f460043b9bcb6153c0f6f82d4a74433efe4ad8;p=fa-stable.git diff --git a/gl/manage/exchange_rates.php b/gl/manage/exchange_rates.php index e7a7f574..05953c04 100644 --- a/gl/manage/exchange_rates.php +++ b/gl/manage/exchange_rates.php @@ -19,14 +19,14 @@ include_once($path_to_root . "/includes/ui.inc"); include_once($path_to_root . "/includes/banking.inc"); $js = ""; -if ($use_date_picker) +if (user_use_date_picker()) $js .= get_js_date_picker(); -page(_("Exchange Rates"), false, false, "", $js); +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,10 @@ function display_rates($curr_code) function display_rate_edit() { - global $selected_id, $table_style2, $Ajax; - - start_table($table_style2); + global $selected_id, $Ajax, $SysPrefs; + $xchg_rate_provider = ((isset($SysPrefs->xr_providers) && isset($SysPrefs->dflt_xr_provider)) + ? $SysPrefs->xr_providers[$SysPrefs->dflt_xr_provider] : 'ECB'); + start_table(TABLESTYLE2); if ($selected_id != "") { @@ -113,7 +120,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 +136,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); @@ -172,7 +178,7 @@ if (!isset($_POST['curr_abrev'])) echo "