#Fixes::158482179::yogeshwar::Email description is changing to html content...

#Fixes::158482179::yogeshwar::Email description is changing to html content when we view the email in detail

layouts/v7/modules/Vtiger/DetailViewBlockView.tpl

@@ -117,7 +117,7 @@
 												{if $fieldDataType eq 'multipicklist'}
 													<input type="hidden" class="fieldBasicData" data-name='{$FIELD_MODEL->get('name')}[]' data-type="{$fieldDataType}" data-displayvalue='{$FIELD_DISPLAY_VALUE}' data-value="{$FIELD_VALUE}" />
 												{else}
-													<input type="hidden" class="fieldBasicData" data-name='{$FIELD_MODEL->get('name')}' data-type="{$fieldDataType}" data-displayvalue='{$FIELD_DISPLAY_VALUE}' data-value="{decode_html($FIELD_VALUE)|strip_tags}" />
+													<input type="hidden" class="fieldBasicData" data-name='{$FIELD_MODEL->get('name')}' data-type="{$fieldDataType}" data-displayvalue='{$FIELD_DISPLAY_VALUE}' data-value="{$FIELD_VALUE}" />
 												{/if}
 											</span>
 											<span class="action pull-right"><a href="#" onclick="return false;" class="editAction fa fa-pencil"></a></span>

layouts/v7/modules/Vtiger/uitypes/StringDetailView.tpl

@@ -42,5 +42,5 @@
 {else if  $FIELD_MODEL->get('name') eq 'signature'}
 	{decode_html($FIELD_MODEL->getDisplayValue($FIELD_MODEL->get('fieldvalue'), $RECORD->getId(), $RECORD))}
 {else}
-    {decode_html($FIELD_MODEL->getDisplayValue($FIELD_MODEL->get('fieldvalue'), $RECORD->getId(), $RECORD))}
+    {$FIELD_MODEL->getDisplayValue($FIELD_MODEL->get('fieldvalue'), $RECORD->getId(), $RECORD)}
 {/if}

modules/SalesOrder/SalesOrder.php

@@ -421,8 +421,7 @@ class SalesOrder extends CRMEntity {
 		if(empty($return_module) || empty($return_id)) return;
 
 		if($return_module == 'Accounts') {
-			$relation_query = 'UPDATE vtiger_salesorder SET accountid=? WHERE salesorderid=?';
-			$this->db->pquery($relation_query, array(null, $id));
+			$this->trash('SalesOrder',$id);
 		}
 		elseif($return_module == 'Quotes') {
 			$relation_query = 'UPDATE vtiger_salesorder SET quoteid=? WHERE salesorderid=?';