X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fcart_class.inc;h=f388b54cac18e438ba4c17d63eb5db614642814c;hb=389721f442ea4dc96ba1cafd65919e717e0d8746;hp=ce885a3285e12ce72f53a91f4670d322353cc9b2;hpb=bf65d2ab9bcc2d92a65d7a40763040f3ed9d1ddb;p=fa-stable.git

diff --git a/sales/includes/cart_class.inc b/sales/includes/cart_class.inc
index ce885a32..f388b54c 100644
--- a/sales/includes/cart_class.inc
+++ b/sales/includes/cart_class.inc
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 /* Definition of the cart class
 this class can hold all the information for:
 
@@ -142,7 +151,7 @@ class cart
 				  $this->customer_id = get_global_customer();
 				else
 				  $this->customer_id = '';
-				$this->document_date = Today();
+				$this->document_date = 	new_doc_date();
 				if (!is_date_in_fiscalyear($this->document_date))
 					$this->document_date = end_fiscalyear();
 				$this->reference = references::get_next($this->trans_type);
@@ -213,15 +222,11 @@ class cart
 			$this->trans_no = 0;
 			$this->order_no= $this->trans_type==13 ? key($src->trans_no) : $src->order_no;
 		}
-// if we want to save old or derivative document first decode html entities
-// from text fields. For new documents this is not needed.
-		if ($this->trans_no || $this->trans_type != 30) {
-			$this->reference = @html_entity_decode($this->reference);
-			$this->Comments = @html_entity_decode($this->Comments);
-			foreach($this->line_items as $lineno => $line) {
-				$this->line_items[$lineno]->stock_id = @html_entity_decode($line->stock_id);
-				$this->line_items[$lineno]->description = @html_entity_decode($line->description);
-			}
+		$this->reference = @html_entity_decode($this->reference);
+		$this->Comments = @html_entity_decode($this->Comments);
+		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);
 		}
 		switch($this->trans_type) {
 			case 10:
@@ -292,8 +297,10 @@ class cart
 		return 0;
 	}
 
-	function update_cart_item($line_no, $qty, $price, $disc)
+	function update_cart_item($line_no, $qty, $price, $disc, $description="")
 	{
+		if ($description != "")
+			$this->line_items[$line_no]->item_description = $description;
 		$this->line_items[$line_no]->quantity = $qty;
 		$this->line_items[$line_no]->qty_dispatched = $qty;
 		$this->line_items[$line_no]->price = $price;