[Weberp-cvs] SF.net SVN: web-erp:[4107] trunk

[<tim...@us...>]

Revision: 4107
          http://web-erp.svn.sourceforge.net/web-erp/?rev=4107&view=rev
Author:   tim_schofield
Date:     2010-10-25 19:43:30 +0000 (Mon, 25 Oct 2010)

Log Message:
-----------
ChenJohn: class.pdf.php - correctly display some html encoded special characters, to make them human readeable in pdf file.

Modified Paths:
--------------
    trunk/doc/Change.log.html
    trunk/includes/class.pdf.php

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-10-25 18:53:44 UTC (rev 4106)
+++ trunk/doc/Change.log.html	2010-10-25 19:43:30 UTC (rev 4107)
@@ -1,10 +1,11 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p></p>
 <p>25/10/10 Marcos Garcia Trejo: New labelprinting functionality </p>
-<p>23/10/10 Phil: PurchData.php - search by name failed concatenation of SQL stuffed now repaired.
+<p>25/10/10 ChenJohn: class.pdf.php - correctly display some html encoded special characters, to make them human readeable in pdf file.</p>
+<p>23/10/10 Phil: PurchData.php - search by name failed concatenation of SQL stuffed now repaired.</p>
 <p>20/10/10 Paul: MiscFunctions.js - Bug #3060329. Correct condition check. [allows the calendar to start with the textbox's date]</p>
 <p>18/10/10 Paul: WorkOrderReceive.php - Bug #3023776. Applied anonymous contribution.</p>
-<p>16/10/10 Phil: SupplierInvocie.php fixed for mix up with commits - now shipment charges added correctly and contract charges also
+<p>16/10/10 Phil: SupplierInvocie.php fixed for mix up with commits - now shipment charges added correctly and contract charges also</p>
 <p>14/10/10 Tim: MiscFunctions.php - Fix bug preventing download of ECB rates</p>
 <p>13/10/10 Tim: WWW_Users.php - Show the last visit date correctly. Fixes bug 3085860</p>
 <p>09/10/10 Phil: Added xmlrpc_GetStockCategoryList api method</p>

Modified: trunk/includes/class.pdf.php
===================================================================
--- trunk/includes/class.pdf.php	2010-10-25 18:53:44 UTC (rev 4106)
+++ trunk/includes/class.pdf.php	2010-10-25 19:43:30 UTC (rev 4107)
@@ -242,7 +242,13 @@
 	}
 
 	function addTextWrap($xb, $yb, $w, $h, $txt, $align='J', $border=0, $fill=0) {
-//		$txt = html_entity_decode($txt);
+
+		//$txt = html_entity_decode($txt);
+
+		//some special characters are html encoded
+		//this code serves to make them appear human readable in pdf file
+		$txt = html_entity_decode($txt, ENT_QUOTES, UTF-8);
+
 		$this->x = $xb;
 		$this->y = $this->h - $yb - $h;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.