X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fcart_class.inc;h=b3d5ac966a19d3fd17af6542801342daa0d2c0d5;hb=2a42ffb56ef6651b8a136cd89271e65d397d7677;hp=de858816d6fb58e92cb7a049bc1008a8de4570e0;hpb=39b91d63e429ec5c7211a71fa0c55d6883e5cf49;p=fa-stable.git

diff --git a/sales/includes/cart_class.inc b/sales/includes/cart_class.inc
index de858816..b3d5ac96 100644
--- a/sales/includes/cart_class.inc
+++ b/sales/includes/cart_class.inc
@@ -121,7 +121,7 @@ class cart
 						$this->delivery_to = $sodata["deliver_to"];
 						$this->delivery_address = $sodata["delivery_address"];
 					}
-					if (!$view && ($type!=ST_CUSTDELIVERY || $this->trans_link!=0)) {
+					if (!$view && ($type!=ST_CUSTCREDIT || $this->trans_link!=0)) {
 						$src_type = get_parent_type($type);
 						$src_details = 0;
 						if ($src_type == ST_SALESORDER) { // get src data from sales_orders
@@ -149,7 +149,7 @@ class cart
 						}
 					}
 				}
-			} else {
+		} else {
 				$this->trans_type = $type;
 				$this->trans_no = 0;
 				// set new sales document defaults here
@@ -228,11 +228,11 @@ class cart
 			$this->trans_no = 0;
 			$this->order_no= $this->trans_type==ST_CUSTDELIVERY ? key($src->trans_no) : $src->order_no;
 		}
-		$this->reference = @html_entity_decode($this->reference);
-		$this->Comments = @html_entity_decode($this->Comments);
+		$this->reference = @html_entity_decode($this->reference, ENT_QUOTES);
+		$this->Comments = @html_entity_decode($this->Comments, ENT_QUOTES);
 		foreach($this->line_items as $lineno => $line) {
-			$this->line_items[$lineno]->stock_id = @html_entity_decode($line->stock_id);
-			$this->line_items[$lineno]->item_description = @html_entity_decode($line->item_description);
+			$this->line_items[$lineno]->stock_id = @html_entity_decode($line->stock_id, ENT_QUOTES);
+			$this->line_items[$lineno]->item_description = @html_entity_decode($line->item_description, ENT_QUOTES);
 		}
 		switch($this->trans_type) {
 			case ST_SALESINVOICE: