Moving 2.0 development version to main trunk.

[fa-stable.git] / gl / manage / exchange_rates.php

diff --git a/gl/manage/exchange_rates.php b/gl/manage/exchange_rates.php
index 52798c8877f00fd460b02cd77b7fc13b10d29d21..669895b14863e539ada9ab9aff00c35775899694 100644 (file)
--- a/gl/manage/exchange_rates.php
+++ b/gl/manage/exchange_rates.php
@@ -13,35 +13,27 @@ if ($use_date_picker)
        $js .= get_js_date_picker();
 page(_("Exchange Rates"), false, false, "", $js);
 
-//---------------------------------------------------------------------------------------------
+simple_page_mode(false);
 
-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;
        }
 
@@ -57,20 +49,20 @@ function handle_submit()
        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;
+       $selected_id = '';
 }
 
 //---------------------------------------------------------------------------------------------
@@ -82,8 +74,7 @@ function handle_delete()
        if ($selected_id == "")
                return;
        delete_exchange_rate($selected_id);
-
-       meta_forward($_SERVER['PHP_SELF']);
+       $selected_id = '';
 }
 
 //---------------------------------------------------------------------------------------------
@@ -101,19 +92,19 @@ function display_rates($curr_code)
 
     $k = 0; //row colour counter
 
-    while ($myrow = db_fetch($result)) 
+    while ($myrow = db_fetch($result))
     {
 
                alt_table_row_color($k);
 
        label_cell(sql2date($myrow["date_"]));
                label_cell(number_format2($myrow["rate_buy"], user_exrate_dec()), "nowrap align=right");
-               edit_link_cell("selected_id=" . $myrow["id"]);
-               delete_link_cell("selected_id=" . $myrow["id"]. "&delete=1");
+               edit_button_cell("Edit".$myrow["id"], _("Edit"));
+               edit_button_cell("Delete".$myrow["id"], _("Delete"));
 
                end_row();
 
-    } //END WHILE LIST LOOP
+    }
 
     end_table();
 }
@@ -122,39 +113,42 @@ function display_rates($curr_code)
 
 function display_rate_edit()
 {
-       global $selected_id, $table_style2;
+       global $selected_id, $table_style2, $Ajax;
 
        start_table($table_style2);
 
-       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 != "") 
+       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
        {
+               $_POST['date_'] = Today();
+               $_POST['BuyRate'] = '';
                date_row(_("Date to Use From:"), 'date_');
        }
-       text_row(_("Exchange Rate:"), 'BuyRate', null, 15, 12, "", submit('get_rate',_("Get"), false));
+       if (isset($_POST['get_rate']))
+       {
+               $_POST['BuyRate'] = exrate_format(get_ecb_rate($_POST['curr_abrev']));
+               $Ajax->activate('BuyRate');
+       }
+       small_amount_row(_("Exchange Rate:"), 'BuyRate', null, '',
+               submit('get_rate',_("Get"), false, _('Get current ECB rate') , true),
+               user_exrate_dec());
 
        end_table(1);
 
-       submit_add_or_update_center($selected_id == "");
+       submit_add_or_update_center($selected_id == '', '', true);
 
        display_note(_("Exchange rates are entered against the company currency."), 1);
 }
@@ -170,36 +164,29 @@ function clear_data()
 
 //---------------------------------------------------------------------------------------------
 
-if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM'])) 
-{
-
-       if (handle_submit()) 
-       {
-               meta_forward($_SERVER['PHP_SELF']);
-       }
-}
+if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') 
+       handle_submit();
 
 //---------------------------------------------------------------------------------------------
 
-if (isset($_GET['delete'])) 
-{
-
+if ($Mode == '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);
+currencies_list('curr_abrev', null, 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 = "";
@@ -207,20 +194,17 @@ if ($_POST['curr_abrev'] != get_global_curr_code())
 
 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']);
-
-       hyperlink_no_params($_SERVER['PHP_SELF'], _("Enter a New Exchange Rate"));
        br(1);
-
     display_rate_edit();
 }