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

diff --git a/sales/includes/db/sales_delivery_db.inc b/sales/includes/db/sales_delivery_db.inc
index 4b38c28c..8678aae8 100644
--- a/sales/includes/db/sales_delivery_db.inc
+++ b/sales/includes/db/sales_delivery_db.inc
@@ -36,25 +36,27 @@ function write_sales_delivery(&$delivery,$bo_policy)
 		$tax_total +=  $taxitem['Value'];
 	}
 	/* Insert/update the debtor_trans */
-	$delivery_no = write_customer_trans(13, $trans_no, $delivery->customer_id,
+	$delivery_no = write_customer_trans(ST_CUSTDELIVERY, $trans_no, $delivery->customer_id,
 		$delivery->Branch, $delivery->document_date, $delivery->reference,
 		$delivery_items_total, 0,
 		$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);
 	} else {
-		void_gl_trans(13, $delivery_no, true);
-		void_stock_move(13, $delivery_no);
-		void_trans_tax_details(13, $delivery_no);
-		delete_comments(13, $delivery_no);
+		void_gl_trans(ST_CUSTDELIVERY, $delivery_no, true);
+		void_stock_move(ST_CUSTDELIVERY, $delivery_no);
+		void_trans_tax_details(ST_CUSTDELIVERY, $delivery_no);
+		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,
@@ -67,19 +69,19 @@ function write_sales_delivery(&$delivery,$bo_policy)
 			$delivery_line->standard_cost = get_standard_cost($delivery_line->stock_id);
 
 		/* add delivery details for all lines */
-		write_customer_trans_detail_item(13, $delivery_no, $delivery_line->stock_id,
+		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
 		if ($delivery_line->qty_old != $delivery_line->qty_dispatched)
-			update_parent_line(13, $delivery_line->src_id,
+			update_parent_line(ST_CUSTDELIVERY, $delivery_line->src_id,
 				$delivery_line->qty_dispatched-$delivery_line->qty_old);
 
 		if ($delivery_line->qty_dispatched != 0) {
-			add_stock_move_customer(13, $delivery_line->stock_id, $delivery_no,
+			add_stock_move_customer(ST_CUSTDELIVERY, $delivery_line->stock_id, $delivery_no,
 				$delivery->Location, $delivery->document_date, $delivery->reference,
 				-$delivery_line->qty_dispatched, $delivery_line->standard_cost,1,
 				$line_price, $delivery_line->discount_percent);
@@ -98,16 +100,15 @@ function write_sales_delivery(&$delivery,$bo_policy)
 				$dim2 = ($delivery->dimension2_id != $customer['dimension2_id'] ? $delivery->dimension2_id : 
 					($customer['dimension2_id'] != 0 ? $customer["dimension2_id"] : $stock_gl_code["dimension2_id"]));
 
-				add_gl_trans_std_cost(13, $delivery_no,
+				add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no,
 					$delivery->document_date, $stock_gl_code["cogs_account"], $dim, $dim2, "",
 					$delivery_line->standard_cost * $delivery_line->qty_dispatched,
 					PT_CUSTOMER, $delivery->customer_id,
 					"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(13, $delivery_no, $delivery->document_date,
+				add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date,
 					$stock_gl_code["inventory_account"], 0, 0, "",
 					(-$delivery_line->standard_cost * $delivery_line->qty_dispatched),
 					PT_CUSTOMER, $delivery->customer_id,
@@ -127,16 +128,16 @@ function write_sales_delivery(&$delivery,$bo_policy)
 	foreach ($taxes as $taxitem) {
 		if ($taxitem['Net'] != 0) {
 				$ex_rate = get_exchange_rate_from_home_currency(get_customer_currency($delivery->customer_id), $delivery->document_date);
-    		    add_trans_tax_details(13, $delivery_no, $taxitem['tax_type_id'],
+    		    add_trans_tax_details(ST_CUSTDELIVERY, $delivery_no, $taxitem['tax_type_id'],
 				$taxitem['rate'], $delivery->tax_included, $taxitem['Value'],
 				$taxitem['Net'], $ex_rate, $delivery->document_date, $delivery->reference );
 		}
 	}
 
-	add_comments(13, $delivery_no, $delivery->document_date, $delivery->Comments);
+	add_comments(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date, $delivery->Comments);
 
 	if ($trans_no == 0) {
-			$Refs->save(13, $delivery_no, $delivery->reference);
+			$Refs->save(ST_CUSTDELIVERY, $delivery_no, $delivery->reference);
 	}
 
 	commit_transaction();
@@ -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) {
-		$order_items = get_sales_order_details($order, 30);
+		$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(13, $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