[Vtigercrm-commits] [vtiger-commits] r10277 - in /vtigercrm/branches/5.0.3: Smarty/templates/PrintReport.tpl modules/Reports/PrintReport.php modules/Reports/Reports.php

Thu Mar 1 03:17:10 EST 2007

Author: saraj
Date: Thu Mar  1 01:16:57 2007
New Revision: 10277

Log:
i18n for Reports - Move report to another folder. Fixes #3016

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/PrintReport.tpl
    vtigercrm/branches/5.0.3/modules/Reports/PrintReport.php
    vtigercrm/branches/5.0.3/modules/Reports/Reports.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/PrintReport.tpl
==============================================================================

--- vtigercrm/branches/5.0.3/Smarty/templates/PrintReport.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/PrintReport.tpl Thu Mar  1 01:16:57 2007
@@ -18,7 +18,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link rel="stylesheet" media="print" href="print.css" type="text/css">
-<title>vtiger -  Print Report</title>
+<title>vtiger -  {$MOD.LBL_PRINT_REPORT}</title>
 <style>
 {literal}
 body{
@@ -58,7 +58,7 @@
 	<table width="80%" border="0" cellpadding="5" cellspacing="0" align="center">
 	<tr>
 		<td align="left" valign="top" style="border:0px solid #000000;">
-		<h2>{$REPORT_NAME}</h2>
+		<h2>{$MOD.$REPORT_NAME}</h2>
 		<font  color="#666666"><div id="report_info"></div></font>
 		</td>
 		<td align="right" style="border:0px solid #000000;" valign="top"><h3 style="color:#CCCCCC">{$COUNT} {$APP.LBL_RECORDS}</h3></td>

Modified: vtigercrm/branches/5.0.3/modules/Reports/PrintReport.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Reports/PrintReport.php (original)
+++ vtigercrm/branches/5.0.3/modules/Reports/PrintReport.php Thu Mar  1 01:16:57 2007
@@ -13,6 +13,7 @@
 require_once("modules/Reports/Reports.php");
 
 global $app_strings;
+global $mod_strings;
 $oPrint_smarty=new vtigerCRM_Smarty;
 $reportid = $_REQUEST["record"];
 $oReport = new Reports($reportid);
@@ -25,6 +26,7 @@
 $total_report = $oReportRun->GenerateReport("PRINT_TOTAL",$filterlist);
 $oPrint_smarty->assign("COUNT",$arr_values[1]);
 $oPrint_smarty->assign("APP",$app_strings);
+$oPrint_smarty->assign("MOD",$mod_strings);
 $oPrint_smarty->assign("REPORT_NAME",$oReport->reportname);
 $oPrint_smarty->assign("PRINT_CONTENTS",$arr_values[0]);
 $oPrint_smarty->assign("TOTAL_HTML",$total_report);

Modified: vtigercrm/branches/5.0.3/modules/Reports/Reports.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Reports/Reports.php (original)
+++ vtigercrm/branches/5.0.3/modules/Reports/Reports.php Thu Mar  1 01:16:57 2007
@@ -159,8 +159,7 @@
 	function sgetRptFldr($mode='')
 	{
 
-		global $adb;
-		global $log;
+		global $adb,$log,$mod_strings;
 		$returndata = Array();
 		$sql = "select * from vtiger_reportfolder order by folderid";
 		$result = $adb->query($sql);
@@ -174,7 +173,7 @@
 					$details = Array();	
 					$details['state'] = $reportfldrow["state"]; 
 					$details['id'] = $reportfldrow["folderid"]; 
-					$details['name'] = $reportfldrow["foldername"]; 
+					$details['name'] = $mod_strings[$reportfldrow["foldername"]]; 
 					$details['description'] = $reportfldrow["description"]; 
 					$details['details'] = $this->sgetRptsforFldr($reportfldrow["folderid"]);
 					$returndata[] = $details;
@@ -187,7 +186,7 @@
 				$details = Array();	
 				$details['state'] = $reportfldrow["state"]; 
 				$details['id'] = $reportfldrow["folderid"]; 
-				$details['name'] = $reportfldrow["foldername"]; 
+				$details['name'] = $mod_strings[$reportfldrow["foldername"]]; 
 				$details['description'] = $reportfldrow["description"]; 
 				$returndata[] = $details;
 			}while($reportfldrow = $adb->fetch_array($result));



