projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed exrate reedition.
[fa-stable.git]
/
gl
/
manage
/
exchange_rates.php
diff --git
a/gl/manage/exchange_rates.php
b/gl/manage/exchange_rates.php
index 493509f9d7a339eb3da2c23638b11b05972984db..204c64f52202bf66a8ee2b2c878479b35a35cc3a 100644
(file)
--- a/
gl/manage/exchange_rates.php
+++ b/
gl/manage/exchange_rates.php
@@
-9,8
+9,8
@@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
-$page_security =
9
;
-$path_to_root
=
"../..";
+$page_security =
'SA_EXCHANGERATE'
;
+$path_to_root
=
"../..";
include($path_to_root . "/includes/db_pager.inc");
include_once($path_to_root . "/includes/session.inc");
include($path_to_root . "/includes/db_pager.inc");
include_once($path_to_root . "/includes/session.inc");
@@
-21,12
+21,12
@@
include_once($path_to_root . "/includes/banking.inc");
$js = "";
if ($use_date_picker)
$js .= get_js_date_picker();
$js = "";
if ($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);
//---------------------------------------------------------------------------------------------
simple_page_mode(false);
//---------------------------------------------------------------------------------------------
-function check_data()
+function check_data(
$selected_id
)
{
if (!is_date($_POST['date_']))
{
{
if (!is_date($_POST['date_']))
{
@@
-34,19
+34,18
@@
function check_data()
set_focus('date_');
return false;
}
set_focus('date_');
return false;
}
- if (
!check_num('BuyRate', 0)
)
+ if (
input_num('BuyRate') <= 0
)
{
{
- display_error( _("The exchange rate
must be numeric and greater than zero
."));
+ display_error( _("The exchange rate
cannot be zero or a negative number
."));
set_focus('BuyRate');
return false;
}
set_focus('BuyRate');
return false;
}
- if (
$_POST['BuyRate'] <= 0
)
+ if (
!$selected_id && get_date_exchange_rate($_POST['curr_abrev'], $_POST['date_'])
)
{
{
- display_error( _("The exchange rate
cannot be zero or a negative number
."));
- set_focus('
BuyRate
');
+ display_error( _("The exchange rate
for the date is already there
."));
+ set_focus('
date_
');
return false;
}
return false;
}
-
return true;
}
return true;
}
@@
-56,7
+55,7
@@
function handle_submit()
{
global $selected_id;
{
global $selected_id;
- if (!check_data())
+ if (!check_data(
$selected_id
))
return false;
if ($selected_id != "")
return false;
if ($selected_id != "")
@@
-73,6
+72,7
@@
function handle_submit()
}
$selected_id = '';
}
$selected_id = '';
+ clear_data();
}
//---------------------------------------------------------------------------------------------
}
//---------------------------------------------------------------------------------------------
@@
-85,6
+85,7
@@
function handle_delete()
return;
delete_exchange_rate($selected_id);
$selected_id = '';
return;
delete_exchange_rate($selected_id);
$selected_id = '';
+ clear_data();
}
//---------------------------------------------------------------------------------------------
}
//---------------------------------------------------------------------------------------------
@@
-100,7
+101,6
@@
function del_link($row)
function display_rates($curr_code)
{
function display_rates($curr_code)
{
- global $table_style;
}
}
@@
-108,9
+108,9
@@
function display_rates($curr_code)
function display_rate_edit()
{
function display_rate_edit()
{
- global $selected_id, $
table_style2, $
Ajax;
+ global $selected_id, $Ajax;
- start_table(
$table_style
2);
+ start_table(
TABLESTYLE
2);
if ($selected_id != "")
{
if ($selected_id != "")
{
@@
-134,16
+134,16
@@
function display_rate_edit()
}
if (isset($_POST['get_rate']))
{
}
if (isset($_POST['get_rate']))
{
- $_POST['BuyRate'] = exrate_format(get_ecb_rate($_POST['curr_abrev']));
+ $_POST['BuyRate'] =
+ maxprec_format(retrieve_exrate($_POST['curr_abrev'], $_POST['date_']));
$Ajax->activate('BuyRate');
}
small_amount_row(_("Exchange Rate:"), 'BuyRate', null, '',
$Ajax->activate('BuyRate');
}
small_amount_row(_("Exchange Rate:"), 'BuyRate', null, '',
- submit('get_rate',_("Get"), false, _('Get current ECB rate') , true),
- user_exrate_dec());
+ submit('get_rate',_("Get"), false, _('Get current ECB rate') , true), 'max');
end_table(1);
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);
}
display_note(_("Exchange rates are entered against the company currency."), 1);
}
@@
-170,14
+170,14
@@
if ($Mode == 'Delete')
//---------------------------------------------------------------------------------------------
//---------------------------------------------------------------------------------------------
-start_form(
false, true
);
+start_form();
if (!isset($_POST['curr_abrev']))
$_POST['curr_abrev'] = get_global_curr_code();
echo "<center>";
echo _("Select a currency :") . " ";
if (!isset($_POST['curr_abrev']))
$_POST['curr_abrev'] = get_global_curr_code();
echo "<center>";
echo _("Select a currency :") . " ";
-currencies_list('curr_abrev', null, true);
+
echo
currencies_list('curr_abrev', null, true);
echo "</center>";
// if currency sel has changed, clear the form
echo "</center>";
// if currency sel has changed, clear the form
@@
-189,10
+189,7
@@
if ($_POST['curr_abrev'] != get_global_curr_code())
set_global_curr_code($_POST['curr_abrev']);
set_global_curr_code($_POST['curr_abrev']);
-$sql = "SELECT date_, rate_buy, id FROM "
- .TB_PREF."exchange_rates "
- ."WHERE curr_code='".$_POST['curr_abrev']."'
- ORDER BY date_ DESC";
+$sql = get_sql_for_exchange_rates();
$cols = array(
_("Date to Use From") => 'date',
$cols = array(
_("Date to Use From") => 'date',
@@
-212,11
+209,9
@@
else
{
br(1);
{
br(1);
- if (list_updated('curr_abrev')) {
- $table->set_sql($sql);
- $table->set_columns($cols);
- }
$table->width = "40%";
$table->width = "40%";
+ if ($table->rec_count == 0)
+ $table->ready = false;
display_db_pager($table);
br(1);
display_rate_edit();
display_db_pager($table);
br(1);
display_rate_edit();