X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fitems_cart.inc;h=bb473fe7e581296317a37b4a516fa02b1c954d90;hb=65fc1fa9fcb655a802ee8bd7b73dc211ed0ed4ed;hp=1b61f5a1e59da0e79187e723a1a4254adc48f203;hpb=a2ae0e35302270ae811db2e6acb44c16b186a970;p=fa-stable.git

diff --git a/includes/ui/items_cart.inc b/includes/ui/items_cart.inc
index 1b61f5a1..bb473fe7 100644
--- a/includes/ui/items_cart.inc
+++ b/includes/ui/items_cart.inc
@@ -38,7 +38,9 @@ class items_cart
 
 	var $tax_info;	// tax info for the GL transaction
 
-	function items_cart($type, $trans_no=0)
+	var $fixed_asset;
+
+	function __construct($type, $trans_no=0)
 	{
 		$this->trans_type = $type;
 		$this->order_id = $trans_no;
@@ -99,10 +101,10 @@ class items_cart
 
 		$low_stock = array();
 
-    	if (!$SysPrefs->allow_negative_stock())
+    	if (!$SysPrefs->allow_negative_stock() || is_fixed_asset($line_item->mb_flag))
     	{
 			foreach ($this->line_items as $line_no => $line_item)
-				if (has_stock_holding($line_item->mb_flag))
+				if (has_stock_holding($line_item->mb_flag) || is_fixed_asset($line_item->mb_flag))
 				{
 					$quantity = $line_item->quantity;
 					if ($reverse)
@@ -120,12 +122,12 @@ class items_cart
 
 	// ----------- GL item functions
 
-	function add_gl_item($code_id, $dimension_id, $dimension2_id, $amount, $memo='', $act_descr=null, $person_id=null)
+	function add_gl_item($code_id, $dimension_id, $dimension2_id, $amount, $memo='', $act_descr=null, $person_id=null, $date=null)
 	{
 		if (isset($code_id) && $code_id != "" && isset($amount) && isset($dimension_id)  &&
 			isset($dimension2_id))
 		{
-			$this->gl_items[] = new gl_item($code_id, $dimension_id, $dimension2_id, $amount, $memo, $act_descr, $person_id);
+			$this->gl_items[] = new gl_item($code_id, $dimension_id, $dimension2_id, $amount, $memo, $act_descr, $person_id, $date);
 			return true;
 		}
 		else
@@ -361,7 +363,10 @@ class items_cart
 		$total_gl = 0;
 		foreach($this->gl_items as $gl)
 		{
-			$total_gl += add_gl_trans($this->trans_type, $this->order_id, $this->tran_date, $gl->code_id, $gl->dimension_id, $gl->dimension2_id, 
+			if (!isset($gl->date))
+				$gl->date = $this->tran_date;
+
+			$total_gl += add_gl_trans($this->trans_type, $this->order_id, $gl->date, $gl->code_id, $gl->dimension_id, $gl->dimension2_id, 
 				$gl->reference,	$gl->amount, $this->currency, $gl->person_type_id, $gl->person_id, "", $this->rate);
 
 			// post to first found bank account using given gl acount code.
@@ -402,7 +407,7 @@ class items_cart
 			foreach($cust_trans as $branch_id => $amount)
 				if (floatcmp($amount, 0))
 					write_cust_journal($this->trans_type, $this->order_id, $branch_id, $this->tran_date,
-						$this->reference, -$amount, $this->rate);
+						$this->reference, $amount, $this->rate);
 			// update AP
 			foreach($supp_trans as $supp_id => $amount)
 				if (floatcmp($amount, 0))
@@ -460,7 +465,7 @@ class line_item
 	var $price;
 	var $standard_cost;
 
-	function line_item ($stock_id, $qty, $standard_cost=null, $description=null)
+	function __construct($stock_id, $qty, $standard_cost=null, $description=null)
 	{
 		$item_row = get_item($stock_id);
 
@@ -476,7 +481,7 @@ class line_item
 			$this->item_description = $description;
 
 		if ($standard_cost == null)
-			$this->standard_cost = $item_row["actual_cost"];
+			$this->standard_cost = $item_row["purchase_cost"];
 		else
 			$this->standard_cost = $standard_cost;
 
@@ -502,9 +507,10 @@ class gl_item
 	var $person_type_id;
 	var $person_name;
 	var $branch_id;
+	var $date;
 
-	function gl_item($code_id=null, $dimension_id=0, $dimension2_id=0, $amount=0, $memo='',
-		$act_descr=null, $person_id=null)
+	function __construct($code_id=null, $dimension_id=0, $dimension2_id=0, $amount=0, $memo='',
+		$act_descr=null, $person_id=null, $date=null)
 	{
 		//echo "adding $index, $code_id, $dimension_id, $amount, $reference<br>";
 
@@ -527,5 +533,6 @@ class gl_item
 		$this->dimension2_id = $dimension2_id;
 		$this->amount = round($amount, 2);
 		$this->reference = $memo;
+		$this->date = $date;
 	}
 }