[Vtigercrm-commits] [vtiger-commits] r10054 - in /vtigercrm/branches/5.0.3: include/utils/EditViewUtils.php modules/Invoice/CreatePDF.php modules/PurchaseOrder/CreatePDF.php modules/Quotes/CreatePDF.php modules/SalesOrder/CreateSOPDF.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Sat Jan 13 04:46:00 2007
New Revision: 10054

Log:
* Added call to from_html for description and terms&conditions fields which are not displayed correctly in pdf whey they have ampersand(&) and single quote and double quote, Fixes #2809

Modified:
    vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php
    vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php
    vtigercrm/branches/5.0.3/modules/PurchaseOrder/CreatePDF.php
    vtigercrm/branches/5.0.3/modules/Quotes/CreatePDF.php
    vtigercrm/branches/5.0.3/modules/SalesOrder/CreateSOPDF.php

Modified: vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Sat Jan 13 04:46:00 2007
@@ -1450,7 +1450,7 @@
 
 		$product_Detail[$i]['hdnProductId'.$i] = $hdnProductId;
 		$product_Detail[$i]['productName'.$i]= from_html($productname);
-		$product_Detail[$i]['productDescription'.$i]= $productdescription;
+		$product_Detail[$i]['productDescription'.$i]= from_html($productdescription);
 		$product_Detail[$i]['comment'.$i]= $comment;
 
 		if($module != 'PurchaseOrder' && $focus->object_name != 'Order')

Modified: vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php Sat Jan 13 04:46:00 2007
@@ -55,8 +55,8 @@
 $ship_code = $focus->column_fields["ship_code"];
 $ship_country = $focus->column_fields["ship_country"];
 
-$conditions = $focus->column_fields["terms_conditions"];
-$description = $focus->column_fields["description"];
+$conditions = from_html($focus->column_fields["terms_conditions"]);
+$description = from_html($focus->column_fields["description"]);
 $status = $focus->column_fields["invoicestatus"];
 
 // Company information

Modified: vtigercrm/branches/5.0.3/modules/PurchaseOrder/CreatePDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/PurchaseOrder/CreatePDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/PurchaseOrder/CreatePDF.php Sat Jan 13 04:46:00 2007
@@ -53,8 +53,8 @@
 $ship_code = $focus->column_fields["ship_code"];
 $ship_country = $focus->column_fields["ship_country"];
 
-$conditions = $focus->column_fields["terms_conditions"];
-$description = $focus->column_fields["description"];
+$conditions = from_html($focus->column_fields["terms_conditions"]);
+$description = from_html($focus->column_fields["description"]);
 $status = $focus->column_fields["postatus"];
 
 // Company information

Modified: vtigercrm/branches/5.0.3/modules/Quotes/CreatePDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Quotes/CreatePDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/Quotes/CreatePDF.php Sat Jan 13 04:46:00 2007
@@ -53,8 +53,8 @@
 $ship_code = $focus->column_fields["ship_code"];
 $ship_country = $focus->column_fields["ship_country"];
 
-$conditions = $focus->column_fields["terms_conditions"];
-$description = $focus->column_fields["description"];
+$conditions = from_html($focus->column_fields["terms_conditions"]);
+$description = from_html($focus->column_fields["description"]);
 $status = $focus->column_fields["quotestage"];
 
 // Company information

Modified: vtigercrm/branches/5.0.3/modules/SalesOrder/CreateSOPDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/SalesOrder/CreateSOPDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/SalesOrder/CreateSOPDF.php Sat Jan 13 04:46:00 2007
@@ -53,8 +53,8 @@
 $ship_code = $focus->column_fields["ship_code"];
 $ship_country = $focus->column_fields["ship_country"];
 
-$conditions = $focus->column_fields["terms_conditions"];
-$description = $focus->column_fields["description"];
+$conditions = from_html($focus->column_fields["terms_conditions"]);
+$description = from_html($focus->column_fields["description"]);
 $status = $focus->column_fields["sostatus"];
 
 // Company information