[Vtigercrm-commits] [vtiger-commits] r9687 - in /vtigercrm/branches/5.0.2/include/utils: DetailViewUtils.php EditViewUtils.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Wed Oct 25 03:45:52 2006
New Revision: 9687

Log:
changes made to fix the issue 2333 -- Minnie

Modified:
    vtigercrm/branches/5.0.2/include/utils/DetailViewUtils.php
    vtigercrm/branches/5.0.2/include/utils/EditViewUtils.php

Modified: vtigercrm/branches/5.0.2/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.2/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/branches/5.0.2/include/utils/DetailViewUtils.php Wed Oct 25 03:45:52 2006
@@ -945,7 +945,8 @@
               $col_fields[$fieldname]='';
 	 if($uitype == 1 && ($fieldname=='expectedrevenue' || $fieldname=='budgetcost' || $fieldname=='actualcost' || $fieldname=='expectedroi' || $fieldname=='actualroi' ))
 	 {
-		$label_fld[] = convertFromDollar($col_fields[$fieldname],$rate);
+		  $rate_symbol=getCurrencySymbolandCRate($user_info['currency_id']);
+		  $label_fld[] = convertFromDollar($col_fields[$fieldname],$rate_symbol['rate']);
 	 }
 	else
 		$label_fld[] = $col_fields[$fieldname];

Modified: vtigercrm/branches/5.0.2/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.2/include/utils/EditViewUtils.php (original)
+++ vtigercrm/branches/5.0.2/include/utils/EditViewUtils.php Wed Oct 25 03:45:52 2006
@@ -1233,7 +1233,8 @@
 		$editview_label[]=$mod_strings[$fieldlabel];
 		if($uitype == 1 && ($fieldname=='expectedrevenue' || $fieldname=='budgetcost' || $fieldname=='actualcost' || $fieldname=='expectedroi' || $fieldname=='actualroi' ) && ($module_name=='Campaigns'))
 		{
-			$fieldvalue[] = convertFromDollar($value,$rate);
+			$rate_symbol = getCurrencySymbolandCRate($user_info['currency_id']);
+			$fieldvalue[] = convertFromDollar($value,$rate_symbol['rate']);
 		}
 		else
 			$fieldvalue[] = $value;