X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_delivery_db.inc;h=5d72855f350d349f08afd1da7ed884652019d820;hb=bf00f0e16df5974ecba17b59be8bc660bdf6b8a8;hp=2367c7dabc4d5e6effcf2d8b3f49ed5d570314f6;hpb=0c1bcd8ce3c089d7ddb3722a097f8fc8417f41e6;p=fa-stable.git

diff --git a/sales/includes/db/sales_delivery_db.inc b/sales/includes/db/sales_delivery_db.inc
index 2367c7da..5d72855f 100644
--- a/sales/includes/db/sales_delivery_db.inc
+++ b/sales/includes/db/sales_delivery_db.inc
@@ -10,6 +10,7 @@ function write_sales_delivery(&$delivery,$bo_policy)
 
 	begin_transaction();
 
+	$customer = get_customer($delivery->customer_id);
 	$delivery_items_total = $delivery->get_items_total_dispatch();
 	$freight_tax = $delivery->get_shipping_tax();
 
@@ -29,14 +30,15 @@ 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->default_sales_type, $delivery->order_no, 0,
-		$delivery->ship_via, $delivery->due_date);
+		$delivery->sales_type, $delivery->order_no, 0,
+		$delivery->ship_via, $delivery->due_date, 0, $delivery->dimension_id, $delivery->dimension2_id);
 
 	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_customer_trans_tax_details(13, $delivery_no);
 		delete_comments(13, $delivery_no);
 	}
 
@@ -49,6 +51,9 @@ function write_sales_delivery(&$delivery,$bo_policy)
 		$line_tax = get_full_price_for_item($delivery_line->stock_id, $delivery_line->price,
 			0, $delivery->tax_included, $delivery->tax_group_array) - $line_taxfree_price;
 
+		if ($trans_no != 0) // Inserted 2008-09-25 Joe Hunt
+			$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,
 			$delivery_line->item_description, $delivery_line->qty_dispatched,
@@ -58,7 +63,7 @@ function write_sales_delivery(&$delivery,$bo_policy)
 
 	// Now update sales_order_details for the quantity delivered
 		if ($delivery_line->qty_old != $delivery_line->qty_dispatched)
-			update_parent_line(13, $delivery_line->id,
+			update_parent_line(13, $delivery_line->src_id,
 				$delivery_line->qty_dispatched-$delivery_line->qty_old);
 
 		if ($delivery_line->qty_dispatched != 0) {
@@ -74,9 +79,15 @@ function write_sales_delivery(&$delivery,$bo_policy)
 			if ($delivery_line->standard_cost != 0) {
 
 				/*first the cost of sales entry*/
+				// 2008-08-01. If there is a Customer Dimension, then override with this,
+				// else take the Item Dimension (if any)
+				$dim = ($delivery->dimension_id != $customer['dimension_id'] ? $delivery->dimension_id : 
+					($customer['dimension_id'] != 0 ? $customer["dimension_id"] : $stock_gl_code["dimension_id"]));
+				$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,
-				$delivery->document_date, $stock_gl_code["cogs_account"],
-					$stock_gl_code["dimension_id"], $stock_gl_code["dimension2_id"], "",
+					$delivery->document_date, $stock_gl_code["cogs_account"], $dim, $dim2, "",
 					$delivery_line->standard_cost * $delivery_line->qty_dispatched,
 					payment_person_types::customer(), $delivery->customer_id,
 					"The cost of sales GL posting could not be inserted");
@@ -111,7 +122,6 @@ function write_sales_delivery(&$delivery,$bo_policy)
 	add_comments(13, $delivery_no, $delivery->document_date, $delivery->Comments);
 
 	if ($trans_no == 0) {
-		// add_forms_for_sys_type(13, $delivery_no, $delivery->Location);
 		if ($delivery->reference!='auto')
 			references::save_last($delivery->reference, 13);
 	}
@@ -129,15 +139,16 @@ function void_sales_delivery($type, $type_no)
 
 	void_gl_trans($type, $type_no, true);
 
-	// for invoices and credits related to invoices,
 	// reverse all the changes in the sales order
 	$items_result = get_customer_trans_details($type, $type_no);
 
 	$order = get_customer_trans_order($type, $type_no);
 
 	if ($order) {
+		$order_items = get_sales_order_details($order);
 		while ($row = db_fetch($items_result)) {
-			update_parent_line(13, $row['id'], -$row['quantity']);
+			$order_line = db_fetch($order_items);
+			update_parent_line(13, $order_line['id'], -$row['quantity']);
 		}
 	}