X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fcart_class.inc;h=d8792dd73a094e8858dbdb520c13055fc22c97a2;hb=98a185d9959e4e273142042b354d42f77e013cdf;hp=f5a120583b7653046d263e9b4ae15259960cdd63;hpb=40ee20a833a502a0914202b56473fb330d5774cf;p=fa-stable.git

diff --git a/sales/includes/cart_class.inc b/sales/includes/cart_class.inc
index f5a12058..d8792dd7 100644
--- a/sales/includes/cart_class.inc
+++ b/sales/includes/cart_class.inc
@@ -55,7 +55,6 @@ class cart
 	var $Location;
 	var $location_name;
 	var $order_no; 		// the original order number
-	var $trans_link = 0;
 
 	var $ship_via;
 	var $freight_cost = 0;
@@ -112,8 +111,6 @@ class cart
 		for($line_no = 0; $line_no < count($this->line_items); $line_no++) {
 			$line = &$this->line_items[$line_no];
 			$line->src_id = $line->id; // save src line ids for update
-//			$line->qty_min = 0;
-//			$line->qty_max = $line->quantity - $line->qty_done;
 			$line->qty_dispatched = $type == ST_CUSTCREDIT ? '0' : $line->quantity - $line->qty_done;
 			$line->qty_old = 0;
 		}
@@ -138,24 +135,32 @@ class cart
 	//
 	function set_parent_constraints($sodata, $src_no) {
 
+		$srcdetails = get_sales_parent_lines($this->trans_type, $src_no);
+		
 		$src_type = get_parent_type($this->trans_type);
-		if ($src_type == ST_SALESORDER || $src_type == 0) { // get src data from sales_orders
+		if ($src_type == ST_SALESORDER || $src_type == 0) {
 			$this->src_docs = array( $sodata['order_no']=>$sodata['version']);
-			$srcdetails = get_sales_order_details($this->order_no, $this->trans_type);
 		} else {	// get src_data from debtor_trans
-			$this->src_docs = get_customer_trans_version($src_type, 
-					get_parent_trans($this->trans_type, $src_no));
-			$srcdetails = get_customer_trans_details($src_type, array_keys($this->src_docs));
+			$srcnum = array();
+			while ($line = db_fetch($srcdetails)) {
+				$srcnum[] = $line['debtor_trans_no'];
+			}
+			$this->src_docs = get_customer_trans_version($src_type, array_values($srcnum));
 		}
 		// calculate & save: qtys on other docs and free qtys on src doc
-		for($line_no = 0; $srcline = db_fetch($srcdetails); $line_no++) {
+		$line_no = 0;
+		// Loop speed optimisation below depends on fact 
+		// that child line_items contains subset of parent lines in _the_same_ order !
+		while ($line_no < count($this->line_items) && $srcline = db_fetch($srcdetails)) {
 			$line = &$this->line_items[$line_no];
-
-			$line->src_id = $srcline['id']; // save src line ids for update
-			if ($this->trans_type == ST_SALESINVOICE)
-				$line->src_no = $srcline['debtor_trans_no'];
-			$line->qty_old = $line->qty_dispatched = $line->quantity;
-			$line->quantity += $srcline['quantity'] - $srcline['qty_done']; // add free qty on src doc
+			if ($srcline['id'] == $line->src_id) {
+				if ($this->trans_type == ST_SALESINVOICE)
+					$line->src_no = $srcline['debtor_trans_no'];
+				$line->qty_old = $line->qty_dispatched = $line->quantity;
+				$line->quantity += $srcline['quantity'] - $srcline['qty_done']; // add free qty on src doc
+				$line_no++;
+				break;
+			}
 		}
 	}
 	//-------------------------------------------------------------------------
@@ -181,7 +186,7 @@ class cart
 						$this->delivery_address = $sodata["delivery_address"];
 					}
 					// child transaction reedition - update with parent info unless it is freehand
-					if (!$no_edit && !($type==ST_CUSTCREDIT && $this->trans_link==0))
+					if (!$no_edit)
 						$this->set_parent_constraints($sodata, $trans_no[0]);
 			}
 			// prepare qtys for derivative document entry (not used in display)
@@ -229,22 +234,12 @@ class cart
 				if ($type == ST_SALESINVOICE) {
 					$this->due_date =
 						get_invoice_duedate($this->payment, $this->document_date);
-					$this->cash = $this->payment_terms['cash_sale'];
-					if ($this->cash) {
-						$this->Location = $pos['pos_location'];
-						$this->location_name = $pos['location_name'];
-						$this->cash_account = $pos['pos_account'];
-						$this->account_name = $pos['bank_account_name'];
-					}
 				} else
 					$this->due_date =
 						add_days($this->document_date, $SysPrefs->default_delivery_required_by());
+			$this->pos = user_pos();
 			}
 		$this->credit = get_current_cust_credit($this->customer_id);
-		$this->pos = user_pos();
-		$pos = get_sales_point($this->pos);
-		if (!$pos['cash_sale'] && !$pos['credit_sale']) 
-			$this->pos = -1; // mark not editable payment type
 	}
 
 	//-------------------------------------------------------------------------
@@ -308,6 +303,16 @@ class cart
 		$this->payment_terms = get_payment_terms($payment);
 		$this->cash = $this->payment_terms['cash_sale'];
 		$this->cash_discount = $cdiscount;
+
+		$pos = get_sales_point($this->pos);
+		if (!$pos['cash_sale'] || !$pos['credit_sale']) 
+		  	$this->pos = -1; // mark not editable payment type
+		if ($this->cash) {
+			$this->Location = $pos['pos_location'];
+			$this->location_name = $pos['location_name'];
+			$this->cash_account = $pos['pos_account'];
+			$this->account_name = $pos['bank_account_name'];
+		}
 		$this->credit = get_current_cust_credit($customer_id);
 	}