X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fcart_class.inc;h=1f54a613b487ef5f065ff1350010a4131187c00e;hb=74dc7287df122a02d0e5ef3b8bda58e60057a5a1;hp=991139121954c66d6be78e232dc34bf40a840e08;hpb=ec3b5ef00ee07bdf7559c8bdb6f857b7464c3fbe;p=fa-stable.git

diff --git a/sales/includes/cart_class.inc b/sales/includes/cart_class.inc
index 99113912..1f54a613 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 Affero General Public License,
+	AGPL, 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/agpl-3.0.html>.
+***********************************************************************/
 /* Definition of the cart class
 this class can hold all the information for:
 
@@ -17,7 +26,7 @@ class cart
 	var $trans_type; // invoice, order, delivery note ...
 	var $trans_no = array();// array (num1=>ver1,..) or 0 for new
 	var $so_type = 0;		// for sales order: simple=0 template=1
-
+	var $cart_id;		// used to detect multi-tab edition conflits
 	var $line_items;  //array of objects of class line_details
 
 	var $src_docs = array();	// array of arrays(num1=>ver1,...) or 0 for no src
@@ -61,6 +70,8 @@ class cart
 	var $cash_account;
 	var $account_name;
 	var $cash_discount;	// not used as of FA 2.1
+	var $dimension_id;
+	var $dimension2_id;
 	//-------------------------------------------------------------------------
 	//
 	//  $trans_no==0 => open new/direct document
@@ -72,7 +83,10 @@ class cart
 		$this->line_items = array();
 		$this->sales_type = "";
 		$this->trans_type = 30;
+		$this->dimension_id = 0;
+		$this->dimension2_id = 0;
 		$this->read($type, $trans_no, $view );
+		$this->cart_id = uniqid('');
 	}
 
 	//-------------------------------------------------------------------------
@@ -141,6 +155,27 @@ class cart
 				if (!is_date_in_fiscalyear($this->document_date))
 					$this->document_date = end_fiscalyear();
 				$this->reference = references::get_next($this->trans_type);
+				if ($type != 30) // Added 2.1 Joe Hunt 2008-11-12
+				{
+					$dim = get_company_pref('use_dimension');
+					if ($dim > 0)
+					{
+						if ($this->customer_id == '')
+							$this->dimension_id = 0;
+						else
+						{
+							$cust = get_customer($this->customer_id);
+							$this->dimension_id = $cust['dimension_id'];
+						}	
+						if ($dim > 1)
+						{
+							if ($this->customer_id == '')
+								$this->dimension2_id = 0;
+							else
+								$this->dimension2_id = $cust['dimension2_id'];
+						}		
+					}		
+				}	
 				if ($type == 10) {
 				  $this->due_date =
 					get_invoice_duedate($this->customer_id, $this->document_date);
@@ -154,7 +189,7 @@ class cart
 				if ($this->cash) {
 					$this->Location = $pos['pos_location'];
 					$this->location_name = $pos['location_name'];
-					$this->cash_account = $pos['account_code'];
+					$this->cash_account = $pos['pos_account'];
 					$this->account_name = $pos['bank_account_name'];
 				}
 				} else
@@ -266,8 +301,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;
@@ -281,7 +318,7 @@ class cart
 
 	function remove_from_cart($line_no)
 	{
-		unset($this->line_items[$line_no]);
+		array_splice($this->line_items, $line_no, 1);
 	}
 
 	function clear_items()