[Web-erp-svn] SF.net SVN: web-erp:[6318] trunk

[<ice...@us...>]

Revision: 6318
          http://sourceforge.net/p/web-erp/reponame/6318
Author:   icedlava
Date:     2013-09-01 17:02:21 +0000 (Sun, 01 Sep 2013)
Log Message:
-----------
Remove entities in company name print out. Fix page number for summary only.

Modified Paths:
--------------
    trunk/Tax.php
    trunk/includes/PDFTaxPageHeader.inc

Modified: trunk/Tax.php
===================================================================
--- trunk/Tax.php	2013-09-01 16:39:05 UTC (rev 6317)
+++ trunk/Tax.php	2013-09-01 17:02:21 UTC (rev 6318)
@@ -228,11 +228,11 @@
 		$pdf->newPage();
 	}
 	/*OK and now the summary */
-
+    if ($PageNumber ==0) $PageNumber=1; //when only summary is run.
 	$FontSize=8;
 	$YPos= $Page_Height-$Top_Margin;
 
-	$pdf->addText($Left_Margin, $YPos,$FontSize, $_SESSION['CompanyRecord']['coyname']);
+	$pdf->addText($Left_Margin, $YPos,$FontSize, html_entity_decode($_SESSION['CompanyRecord']['coyname']));
 
 	$YPos -=$line_height;
 

Modified: trunk/includes/PDFTaxPageHeader.inc
===================================================================
--- trunk/includes/PDFTaxPageHeader.inc	2013-09-01 16:39:05 UTC (rev 6317)
+++ trunk/includes/PDFTaxPageHeader.inc	2013-09-01 17:02:21 UTC (rev 6318)
@@ -10,7 +10,7 @@
 $FontSize=8;
 $YPos= $Page_Height-$Top_Margin;
 
-$pdf->addText($Left_Margin, $YPos,$FontSize, $_SESSION['CompanyRecord']['coyname']);
+$pdf->addText($Left_Margin, $YPos,$FontSize, html_entity_decode($_SESSION['CompanyRecord']['coyname']));
 
 $YPos -=$line_height;