From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Fri, 16 Jan 2009 18:18:55 +0000 (+0000)
Subject: Fixed new db pager generation on first display of exchange_rates page.
X-Git-Tag: v2.4.2~19^2~1606
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=ea24e6536845545b8220c3c21801b51b831bbfeb;p=fa-stable.git

Fixed new db pager generation on first display of exchange_rates page.
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 53e0b1a1..ea20a760 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,10 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+16-Jan-2009 Janusz Dobrowolski
+! Fixed new pager generation on first display.
+$ /gl/manage/exchange_rates.php
+
 15-Jan-2009 Joe Hunt
 ! Adjustment of db pager width. Copyright notes. 
 $ All files with db pager
diff --git a/gl/manage/exchange_rates.php b/gl/manage/exchange_rates.php
index 5381831a..39ad4bea 100644
--- a/gl/manage/exchange_rates.php
+++ b/gl/manage/exchange_rates.php
@@ -93,24 +93,6 @@ function display_rates($curr_code)
 {
 	global $table_style;
 
-	$sql = "SELECT date_, rate_buy, id FROM "
-		.TB_PREF."exchange_rates "
-		."WHERE curr_code='$curr_code'
-		 ORDER BY date_ DESC";
-
-	$cols = array(
-		_("Date to Use From") => 'date', 
-		_("Exchange Rate") => 'rate',
-		array('insert'=>true, 'fun'=>'edit_link'),
-		array('insert'=>true, 'fun'=>'del_link'),
-	);
-	$table =& new_db_pager('orders_tbl', $sql, $cols);
-	if (list_updated('curr_abrev')) {
-		$table->set_sql($sql);
-		$table->set_columns($cols);
-	}
-	$table->width = "40%";
-	display_db_pager($table);
 }
 
 //---------------------------------------------------------------------------------------------
@@ -201,6 +183,19 @@ if ($_POST['curr_abrev'] != get_global_curr_code())
 
 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";
+
+$cols = array(
+	_("Date to Use From") => 'date', 
+	_("Exchange Rate") => 'rate',
+	array('insert'=>true, 'fun'=>'edit_link'),
+	array('insert'=>true, 'fun'=>'del_link'),
+);
+$table =& new_db_pager('orders_tbl', $sql, $cols);
+
 if (is_company_currency($_POST['curr_abrev']))
 {
 
@@ -211,7 +206,12 @@ else
 {
 
 	br(1);
-    display_rates($_POST['curr_abrev']);
+   	if (list_updated('curr_abrev')) {
+		$table->set_sql($sql);
+		$table->set_columns($cols);
+	}
+	$table->width = "40%";
+	display_db_pager($table);
    	br(1);
     display_rate_edit();
 }