diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php
index d090bb5667..6874ef0720 100644
--- a/app/xml_cdr/xml_cdr.php
+++ b/app/xml_cdr/xml_cdr.php
@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2012
+	Portions created by the Initial Developer are Copyright (C) 2008-2014
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -314,14 +314,6 @@ else {
 		require_once "app/billings/functions.php";
 		require_once "resources/classes/database.php";
 		$database = new database;
-		$database->table = "v_billings";
-		$tv = (strlen($_GET["accountcode"])?$_GET["accountcode"]:$_SESSION[domain_name]);
-		$database->sql = "SELECT currency from v_billings WHERE type_value='$tv'";
-		$database->result = $database->execute();
-		$currency = (strlen($database->result[0]['currency'])?$database->result[0]['currency']:'USD');
-		unset($database->sql);
-		unset($database->result);
-
 	}
 	if ($result_count > 0) {
 		foreach($result as $row) {
@@ -448,26 +440,28 @@ else {
 
 			if (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/app/billings/app_config.php")){
 
-				$price = $row['call_sell'];
-				$lcr_direction = (strlen($row['direction'])?$row['direction']:"outbound");
+				$database->table = "v_xml_cdr";
+				$accountcode = (strlen($row["accountcode"])?$row["accountcode"]:$_SESSION[domain_name]);
+				$database->sql = "SELECT currency FROM v_billings WHERE type_value='$accountcode'";
+				$database->result = $database->execute();
+				$billing_currency = (strlen($database->result[0]['currency'])?$database->result[0]['currency']:'USD');
+				unset($database->sql);
+				unset($database->result);
 
 				$sell_price = $row['call_sell'];
 				$lcr_direction = (strlen($row['direction'])?$row['direction']:"outbound");
 				$n = (($lcr_direction == "inbound")?$row['caller_id_number']:$row['destination_number']);
 				
-				if ($lcr_direction == "inbound"){
-					$n = $row['caller_id_number'];
-				}
 				$database->table = "v_lcr";
-				$database->sql = "SELECT currency FROM v_lcr WHERE v_lcr.carrier_uuid= '' AND v_lcr.lcr_direction='$lcr_direction' AND v_lcr.digits IN (".number_series($n).") ORDER BY digits DESC, rate ASC, date_start DESC LIMIT 1";
+				$database->sql = "SELECT currency FROM v_lcr WHERE v_lcr.carrier_uuid= '' AND v_lcr.enabled='true' AND v_lcr.lcr_direction='$lcr_direction' AND v_lcr.digits IN (".number_series($n).") ORDER BY digits DESC, rate ASC, date_start DESC LIMIT 1";
 				$database->result = $database->execute();
 				//print "<pre>"; print_r($database->result); print "[".$database->result[0]['currency']."]"; print "</pre>";
 
-				$billed_currency = ((is_string($database->result[0]['currency']) && strlen($database->result[0]['currency']))?$database->result[0]['currency']:'USD');	//billed currency
+				$lcr_currency = ((is_string($database->result[0]['currency']) && strlen($database->result[0]['currency']))?$database->result[0]['currency']:'USD');	//billed currency
 				unset($database->sql);
 				unset($database->result);
-				$price = currency_convert($price, $currency, $billed_currency);
-				echo "	<td valign='top' class='".$row_style[$c]."'>".number_format($price,6)." $billed_currency</td>\n";
+				$price = currency_convert($sell_price, $billing_currency, $lcr_currency);
+				echo "	<td valign='top' class='".$row_style[$c]."'>".number_format($price,6)." $billing_currency</td>\n";
 			}
 			if (permission_exists("xml_cdr_pdd")) {
 				echo "	<td valign='top' class='".$row_style[$c]."'>".number_format($row['pdd_ms']/1000,2)."s</td>\n";
@@ -515,5 +509,4 @@ else {
 
 //show the footer
 	require_once "resources/footer.php";
-
-?>
\ No newline at end of file
+?>