X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_delivery_db.inc;h=8678aae84e9ed510f11dfd2827818588a1bbf122;hb=83086e6733af3dbfd67edcac751dad7daf3a4fae;hp=8bd2d785a3750c6a8836cc8172e4c8d1b5d3a3c8;hpb=ddadb47f2620ce6902ad4694ce6512568862ba05;p=fa-stable.git

diff --git a/sales/includes/db/sales_delivery_db.inc b/sales/includes/db/sales_delivery_db.inc
index 8bd2d785..8678aae8 100644
--- a/sales/includes/db/sales_delivery_db.inc
+++ b/sales/includes/db/sales_delivery_db.inc
@@ -42,8 +42,9 @@ function write_sales_delivery(&$delivery,$bo_policy)
 		$delivery->tax_included ? 0 : $tax_total-$freight_tax,
 		$delivery->freight_cost,
 		$delivery->tax_included ? 0 : $freight_tax,
-		$delivery->sales_type, $delivery->order_no, 0,
-		$delivery->ship_via, $delivery->due_date, 0, 0, $delivery->dimension_id, $delivery->dimension2_id);
+		$delivery->sales_type, $delivery->order_no,
+		$delivery->ship_via, $delivery->due_date, 0, 0, $delivery->dimension_id, 
+		$delivery->dimension2_id, $delivery->payment);
 
 	if ($trans_no == 0) {
 		$delivery->trans_no = array($delivery_no=>0);
@@ -54,7 +55,8 @@ function write_sales_delivery(&$delivery,$bo_policy)
 		delete_comments(ST_CUSTDELIVERY, $delivery_no);
 	}
 
-	foreach ($delivery->line_items as $delivery_line) {
+	foreach ($delivery->line_items as $line_no => $delivery_line) {
+
 		$line_price = $delivery_line->line_price();
 		$line_taxfree_price = get_tax_free_price_for_item($delivery_line->stock_id,
 			$delivery_line->price, 0, $delivery->tax_included,
@@ -70,7 +72,7 @@ function write_sales_delivery(&$delivery,$bo_policy)
 		write_customer_trans_detail_item(ST_CUSTDELIVERY, $delivery_no, $delivery_line->stock_id,
 			$delivery_line->item_description, $delivery_line->qty_dispatched,
 			$delivery_line->line_price(), $line_tax,
-			$delivery_line->discount_percent, $delivery_line->standard_cost,
+			$delivery_line->discount_percent, $delivery_line->standard_cost, $delivery_line->src_id,
 			$trans_no ? $delivery_line->id : 0);
 
 	// Now update sales_order_details for the quantity delivered
@@ -105,7 +107,6 @@ function write_sales_delivery(&$delivery,$bo_policy)
 					"The cost of sales GL posting could not be inserted");
 
 				/*now the stock entry*/
-				//$stock_gl_code = get_stock_gl_code($order_line->stock_id);
 
 				add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date,
 					$stock_gl_code["inventory_account"], 0, 0, "",
@@ -146,9 +147,10 @@ function write_sales_delivery(&$delivery,$bo_policy)
 
 //--------------------------------------------------------------------------------------------------
 
-function void_sales_delivery($type, $type_no)
+function void_sales_delivery($type, $type_no, $transactions=true)
 {
-	begin_transaction();
+	if ($transactions)
+		begin_transaction();
 
 	void_gl_trans($type, $type_no, true);
 
@@ -158,10 +160,11 @@ function void_sales_delivery($type, $type_no)
 	$order = get_customer_trans_order($type, $type_no);
 
 	if ($order) {
+		$auto = (get_reference(ST_SALESORDER, $order) == "auto");
 		$order_items = get_sales_order_details($order, ST_SALESORDER);
 		while ($row = db_fetch($items_result)) {
 			$order_line = db_fetch($order_items);
-			update_parent_line(ST_CUSTDELIVERY, $order_line['id'], -$row['quantity']);
+			update_parent_line(ST_CUSTDELIVERY, $order_line['id'], -$row['quantity'], $auto);
 		}
 	}
 
@@ -176,6 +179,7 @@ function void_sales_delivery($type, $type_no)
 	// DO NOT MOVE THIS ABOVE VOIDING or we can end up with trans with alloc < 0
 	void_customer_trans($type, $type_no);
 
-	commit_transaction();
+	if ($transactions)
+		commit_transaction();
 }
 ?>
\ No newline at end of file