X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fcart_class.inc;h=adfe941a22b78c7f83a89051862175ab1482b7b9;hb=3aada292902adb788119da40db39f437fcfc7654;hp=60491f564b3202acbc4ba095236198337462d906;hpb=0b63d898491b6577a5a5bf90e771dca0dcbbcf1f;p=fa-stable.git

diff --git a/sales/includes/cart_class.inc b/sales/includes/cart_class.inc
index 60491f56..adfe941a 100644
--- a/sales/includes/cart_class.inc
+++ b/sales/includes/cart_class.inc
@@ -21,7 +21,7 @@ iv)  a delivery note
 include_once($path_to_root . "/inventory/includes/inventory_db.inc");
 include_once($path_to_root . "/taxes/tax_calc.inc");
 
-class cart
+class Cart 
 {
 	var $trans_type; // invoice, order, quotation, delivery note ...
 	var $trans_no = array();// array (num1=>ver1,..) or 0 for new
@@ -45,7 +45,7 @@ class cart
 	var $Branch;
 	var $email;
 
-	var $deliver_to;
+	var $delivery_to;
 	var $delivery_address;
 	var $phone;
 
@@ -71,16 +71,19 @@ class cart
 	var $dimension_id;
 	var $dimension2_id;
 	var $payment;
-	var $payment_terms; // cached payment terms
+	var $payment_terms = array('cash_sale' => false, 'days_before_due' => 0); // cached payment terms
 	var $credit;
 	// prepayment mode:
-	var $prepaid;		// true for documents issued in prepayment mode
-	var $prep_amount;	// prepayment required for SO, invoiced amount for prepaiament invoice
+	var $prepaid=false;	// true for documents issued in prepayment mode
+	var $prep_amount=0;	// prepayment required for SO, invoiced amount for prepaiament invoice
 	var $sum_paid; 		// sum of all allocated prepayments both to order and related invoices
 	var $alloc; 		// sum of payments allocated to this document
 	var $prepayments = array(); // allocation records for this document
 	var $ex_rate;
 
+	var $fixed_asset = false;
+	var $bo_policy = null;
+
 	//-------------------------------------------------------------------------
 	//
 	//  $trans_no==0 => open new/direct document
@@ -88,7 +91,7 @@ class cart
 	//  $trans_no!=0 && $prepare_child==true => prepare for child doc entry
 	//	$prepare_child is set to ST_SALESINVOICE for prepayment invoices
 	//
-	function Cart($type, $trans_no=0, $prepare_child=false) {
+	function __construct($type, $trans_no=0, $prepare_child=false) {
 		/*Constructor function initialises a new shopping cart */
 		$this->line_items = array();
 		$this->sales_type = "";
@@ -116,10 +119,10 @@ class cart
 	*/
 	function get_items()
 	{
-		global $sort_sales_items;
+		global $SysPrefs;
 
 		$items = $this->line_items;
-		if (@$sort_sales_items)
+		if (@$SysPrefs->sort_sales_items)
 			uasort($items, array($this, '_cmp_lines'));
 
 		return $items;
@@ -135,7 +138,8 @@ class cart
 			$type = get_child_type($this->trans_type);
 
 		$this->trans_type = $type;
-		$this->reference = $Refs->get_next($this->trans_type);
+		$this->reference = $Refs->get_next($this->trans_type, null, array('date' => $this->document_date,
+			'customer' => $this->customer_id, 'branch' => $this->Branch));
 		if ($type == ST_CUSTCREDIT)
 		    $this->src_date = $this->document_date;
 
@@ -179,6 +183,11 @@ class cart
 		while (($line_no < count($this->line_items)) && ($srcline = db_fetch($srcdetails))) {
 			$line = &$this->line_items[$line_no];
 			$src_docs[] = $src_type == ST_SALESORDER ?  $srcline['order_no'] : $srcline['debtor_trans_no'];
+			while($srcline['id'] != $line->src_id) // Logic : This will increment the line_items array till sales_order line is matched.
+ 			{	// Fixes Delivery note bug : Parent constraints not working if sales order line deleted after delivery 
+     			$line_no++;
+     			$line = &$this->line_items[$line_no];
+ 			}
 			if ($srcline['id'] == $line->src_id) {
 				if ($this->trans_type == ST_SALESINVOICE)
 					$line->src_no = $srcline['debtor_trans_no'];
@@ -209,64 +218,65 @@ class cart
 			if ($type == ST_SALESORDER || $type == ST_SALESQUOTE) { // sales order || sales quotation
 				read_sales_order($trans_no[0], $this, $type);
 			} else {	// other type of sales transaction
-					read_sales_trans($type, $trans_no, $this);
-					$this->prepayments = get_payments_for($trans_no[0], $type);
-					if ($this->order_no) { // free hand credit notes have no order_no
-						$sodata = get_sales_order_header($this->order_no, ST_SALESORDER);
-						$this->cust_ref = $sodata["customer_ref"];
-					// currently currency is hard linked to debtor account
-					//	$this->customer_currency = $sodata["curr_code"];
-						$this->delivery_to = $sodata["deliver_to"];
-						$this->delivery_address = $sodata["delivery_address"];
-					// child transaction reedition - update with parent info unless it is freehand
-					if (!$this->is_prepaid() && !$prepare_child) // this is read for view/reedition
-						$this->set_parent_constraints($sodata, $trans_no[0]);
-					}
+				read_sales_trans($type, $trans_no, $this);
+				$this->prepayments = get_payments_for($trans_no[0], $type, $this->customer_id);
+				$this->update_payments();
+				if ($this->order_no) { // free hand credit notes have no order_no
+					$sodata = get_sales_order_header($this->order_no, ST_SALESORDER);
+					$this->cust_ref = $sodata["customer_ref"];
+				// currently currency is hard linked to debtor account
+					$this->delivery_to = $sodata["deliver_to"];
+					$this->delivery_address = $sodata["delivery_address"];
+				// child transaction reedition - update with parent info unless it is freehand
+				if (!$this->is_prepaid() && !$prepare_child) // this is read for view/reedition
+					$this->set_parent_constraints($sodata, $trans_no[0]);
+				}
 			}
 			// convert document into child and prepare qtys for entry
 			if ($prepare_child)
 				$this->prepare_child($prepare_child);
 
 		} else { // new document
-				$this->trans_type = $type;
-				$this->trans_no = 0;
-				$this->customer_currency = get_company_currency();
-				// set new sales document defaults here
-				if (get_global_customer() != ALL_TEXT)
-				  $this->customer_id = get_global_customer();
-				else
-				  $this->customer_id = '';
-				$this->document_date = new_doc_date();
-				if (!is_date_in_fiscalyear($this->document_date))
-					$this->document_date = end_fiscalyear();
-				$this->reference = $Refs->get_next($this->trans_type);
-				if ($type != ST_SALESORDER && $type != ST_SALESQUOTE) // Added 2.1 Joe Hunt 2008-11-12
+			$this->trans_type = $type;
+			$this->trans_no = 0;
+			$this->customer_currency = get_company_currency();
+			// set new sales document defaults here
+			if (get_global_customer() != ALL_TEXT)
+			  $this->customer_id = get_global_customer();
+			else
+			  $this->customer_id = '';
+			$this->document_date = new_doc_date();
+			if (!is_date_in_fiscalyear($this->document_date))
+				$this->document_date = end_fiscalyear();
+			$this->reference = $Refs->get_next($this->trans_type, null, array('date' => Today(),
+				'customer' => $this->customer_id));
+			if ($type != ST_SALESORDER && $type != ST_SALESQUOTE) // Added 2.1 Joe Hunt 2008-11-12
+			{
+				$dim = get_company_pref('use_dimension');
+				if ($dim > 0)
 				{
-					$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->dimension_id = 0;
+							$this->dimension2_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'];
-						}		
+							$this->dimension2_id = $cust['dimension2_id'];
 					}		
-				}	
-				if ($type == ST_SALESINVOICE) {
-					$this->due_date =
-						get_invoice_duedate($this->payment, $this->document_date);
-				} else
-					$this->due_date =
-						add_days($this->document_date, $SysPrefs->default_delivery_required_by());
+				}		
+			}	
+			if ($type == ST_SALESINVOICE) {
+				$this->due_date =
+					get_invoice_duedate($this->payment, $this->document_date);
+			} else
+				$this->due_date =
+					add_days($this->document_date, $SysPrefs->default_delivery_required_by());
 		}
 		$this->credit = get_current_cust_credit($this->customer_id);
 	}
@@ -276,12 +286,19 @@ class cart
 	// Makes parent documents for direct delivery/invoice by recurent call.
 	// $policy - 0 or 1:  writeoff/return for IV, back order/cancel for DN
 	function write($policy=0) {
-
+		
+		global $SysPrefs, $Refs;
+		
 		begin_transaction(); // prevents partial database changes in case of direct delivery/invoice
 		if ($this->reference != 'auto' && $this->trans_no == 0 && !is_new_reference($this->reference, $this->trans_type))
 		{
-			commit_transaction();
-			return -1;
+			if (!empty($SysPrefs->prefs['ref_no_auto_increase']))
+				$this->reference = $Refs->get_next($this->trans_type, null, array('date' => Today()));
+			else	
+			{
+				commit_transaction();
+				return -1;
+			}
 		}
 		if (count($this->src_docs) == 0 && ($this->trans_type == ST_SALESINVOICE || $this->trans_type == ST_CUSTDELIVERY) && !$this->is_prepaid()) {
 			// this is direct document - first add parent
@@ -372,7 +389,7 @@ class cart
 	function set_delivery($shipper, $destination, $address, $freight_cost=null)
 	{
 		$this->ship_via = $shipper;
-		$this->deliver_to = $destination;
+		$this->delivery_to = $destination;
 		$this->delivery_address = $address;
 		if (isset($freight_cost))
 			$this->freight_cost = $freight_cost;
@@ -502,7 +519,7 @@ class cart
 		}
 
 		$taxes = get_tax_for_items($items, $prices, $shipping_cost,
-		  $this->tax_group_id, $this->tax_included,  $this->tax_group_array);
+		  	$this->tax_group_id, $this->tax_included,  $this->tax_group_array);
 
     // Adjustment for swiss franken, we always have 5 rappen = 1/20 franken
     if ($this->customer_currency == 'CHF') {
@@ -549,7 +566,6 @@ class cart
 		$total = $this->get_items_total() + $this->freight_cost;
 		$dec = user_price_dec();
 		if (!$this->tax_included ) {
-			$total += $this->get_shipping_tax();
 			$taxes = $this->get_taxes();
 			foreach($taxes as $tax)
 				$total += round($tax['Value'], $dec);
@@ -558,12 +574,46 @@ class cart
 		return $total;
 	}
 
+	/*
+		Checks cart quantities on document_date.
+		Returns array of stock_ids which stock quantities would go negative on some day.
+	*/
+	function check_qoh($date=null, $location=null)
+	{
+		$low_stock = array();
+		// check only for customer delivery and direct sales invoice 
+	   	if (!($this->trans_type == ST_CUSTDELIVERY || ($this->trans_type == ST_SALESINVOICE && $this->trans_no==0)))
+	   		return $low_stock;
+
+		// collect quantities by stock_id
+		$qtys = array();
+		foreach ($this->line_items as $line_no => $line_item)
+		{
+			if (has_stock_holding($line_item->mb_flag))
+			{
+				if (!$this->trans_no) // new delivery
+					$qtys[$line_item->stock_id]['qty'] = $line_item->qty_dispatched + @$qtys[$line_item->stock_id]['qty'];
+				else	// DN modification: check change in quantity
+					$qtys[$line_item->stock_id]['qty'] = ($line_item->qty_dispatched-$line_item->qty_old) + @$qtys[$line_item->stock_id]['qty'];
+				$qtys[$line_item->stock_id]['line'] = $line_no;
+			}
+		}
+
+		foreach($qtys as $stock_id => $sum)
+		{
+			if (check_negative_stock($stock_id, -$sum['qty'], $location ? $location : $this->Location, $date ? $date : $this->document_date))
+				$low_stock[] = $stock_id;
+		}
+
+		return $low_stock;
+	}
+
 	/*
 		Returns true for documents issued in prepayment cycle.
 	*/
 	function is_prepaid()
 	{
-		return $this->prepaid; //floatcmp($this->prep_amount, 0) > 0;
+		return $this->prepaid; 
 	}
 	/*
 		Order is ready for delivery in prepament mode.
@@ -594,12 +644,12 @@ class cart
 		$remainder = prepaid_invoice_remainder($this->order_no);
 
 		// recalculate prepaid part from payments
-		if ($this->payment_terms['days_before_due'] < 0)
+		if ($this->payment_terms['days_before_due'] == -1)
 		{	// this is partial invoice for selected prepayments made.
 			$paid = 0;
 			foreach($this->prepayments as $payment)
 				$paid += $payment['amt'];
-			$this->prep_amount = min($remainder, $paid);
+			$this->prep_amount = $this->trans_no ? $paid : min($remainder, $paid);
 		} else	// this is final invoice
 			$this->prep_amount = $remainder;
 	}
@@ -650,7 +700,7 @@ class line_details
 	var $qty_old = 0;
 
 
-	function line_details ($stock_id, $qty, $prc, $disc_percent,
+	function __construct($stock_id, $qty, $prc, $disc_percent,
 		$qty_done, $standard_cost, $description, $id=0, $src_no=0, $src_id=0)
 	{
 	/* Constructor function to add a new LineDetail object with passed params */
@@ -670,7 +720,6 @@ class line_details
 			$this->item_description = $item_row["description"];
 		else
 			$this->item_description = $description;
-		//$this->standard_cost = $item_row["material_cost"] + $item_row["labour_cost"] + $item_row["overhead_cost"];
 		$this->tax_type = $item_row["tax_type_id"];
 		$this->tax_type_name = $item_row["tax_type_name"];
 		$this->stock_id = $stock_id;
@@ -690,4 +739,3 @@ class line_details
 	}
 }
 
-?>