X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fitems_cart.inc;h=44fb14946bd33b86b89a22a127d851691c2b21f7;hb=8a566dd3a7906e8146a0b045f023f086c93421d8;hp=bb473fe7e581296317a37b4a516fa02b1c954d90;hpb=19ddc3939071044c8e94b628f1d6a039f50cc493;p=fa-stable.git

diff --git a/includes/ui/items_cart.inc b/includes/ui/items_cart.inc
index bb473fe7..44fb1494 100644
--- a/includes/ui/items_cart.inc
+++ b/includes/ui/items_cart.inc
@@ -52,13 +52,13 @@ class items_cart
 
 	// --------------- line item functions
 
-	function add_to_cart($line_no, $stock_id, $qty, $standard_cost, $description=null)
+	function add_to_cart($line_no, $stock_id, $qty, $unit_cost, $description=null)
 	{
 
 		if (isset($stock_id) && $stock_id != "" && isset($qty))
 		{
 			$this->line_items[$line_no] = new line_item($stock_id, $qty,
-				$standard_cost, $description);
+				$unit_cost, $description);
 			return true;
 		}
 		else
@@ -79,10 +79,10 @@ class items_cart
 		return null;
 	}
 
-	function update_cart_item($line_no, $qty, $standard_cost)
+	function update_cart_item($line_no, $qty, $unit_cost)
 	{
 		$this->line_items[$line_no]->quantity = $qty;
-		$this->line_items[$line_no]->standard_cost = $standard_cost;
+		$this->line_items[$line_no]->unit_cost = $unit_cost;
 	}
 
 	function remove_from_cart($line_no)
@@ -101,7 +101,7 @@ class items_cart
 
 		$low_stock = array();
 
-    	if (!$SysPrefs->allow_negative_stock() || is_fixed_asset($line_item->mb_flag))
+    	if (!$SysPrefs->allow_negative_stock())
     	{
 			foreach ($this->line_items as $line_no => $line_item)
 				if (has_stock_holding($line_item->mb_flag) || is_fixed_asset($line_item->mb_flag))
@@ -224,7 +224,7 @@ class items_cart
 	{
 		foreach ($this->gl_items as $gl_item)
 		{
-			if ($gl_item->person_id)
+			if (is_subledger_account($gl_item->code_id))
 				return true;
 		}
 		return false;
@@ -309,7 +309,7 @@ class items_cart
 		if (!isset($tax_info['tax_reg']) && isset($tax_info['person_type']))
 			$tax_info['tax_reg'] = $tax_info['person_type']==PT_CUSTOMER ? TR_OUTPUT : TR_INPUT;
 
-		if (count(@$tax_info['net_amount']))	// guess exempt sales/purchase if any tax has been found
+		if (count_array(@$tax_info['net_amount']))	// guess exempt sales/purchase if any tax has been found
 		{
 			$ex_net = abs($net_sum) - @array_sum($tax_info['net_amount']);
 			if ($ex_net != 0)
@@ -463,9 +463,9 @@ class line_item
 
 	var $quantity;
 	var $price;
-	var $standard_cost;
+	var $unit_cost;
 
-	function __construct($stock_id, $qty, $standard_cost=null, $description=null)
+	function __construct($stock_id, $qty, $unit_cost=null, $description=null)
 	{
 		$item_row = get_item($stock_id);
 
@@ -480,10 +480,10 @@ class line_item
 		else
 			$this->item_description = $description;
 
-		if ($standard_cost == null)
-			$this->standard_cost = $item_row["purchase_cost"];
+		if ($unit_cost == null)
+			$this->unit_cost = $item_row["purchase_cost"];
 		else
-			$this->standard_cost = $standard_cost;
+			$this->unit_cost = $unit_cost;
 
 		$this->stock_id = $stock_id;
 		$this->quantity = $qty;