X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fincludes%2Fdb%2Fsales_delivery_db.inc;h=f74afa20ee4a8c474102fb085905cb5487144cb9;hb=90b3d069d96b99671af51726e2953352738abb75;hp=db34dedabfe9b309bb0cd6d2e4d36837aadab5f8;hpb=dc99a4af783003bbabddd59e87db18a8af4476cb;p=fa-stable.git

diff --git a/sales/includes/db/sales_delivery_db.inc b/sales/includes/db/sales_delivery_db.inc
index db34deda..f74afa20 100644
--- a/sales/includes/db/sales_delivery_db.inc
+++ b/sales/includes/db/sales_delivery_db.inc
@@ -20,6 +20,8 @@ function write_sales_delivery(&$delivery,$bo_policy)
 	if (is_array($trans_no)) $trans_no = key($trans_no);
 
 	begin_transaction();
+	$delivery->bo_policy = $bo_policy;
+	hook_db_prewrite($delivery, ST_CUSTDELIVERY);
 
 	$customer = get_customer($delivery->customer_id);
 	$delivery_items_total = $delivery->get_items_total_dispatch();
@@ -42,9 +44,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->sales_type, $delivery->order_no,
 		$delivery->ship_via, $delivery->due_date, 0, 0, $delivery->dimension_id, 
-		$delivery->dimension2_id, $delivery->payment);
+		$delivery->dimension2_id, $delivery->payment, $delivery->tax_included);
 
 	if ($trans_no == 0) {
 		$delivery->trans_no = array($delivery_no=>0);
@@ -65,14 +67,14 @@ 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
+		//if ($trans_no != 0) // Inserted 2008-09-25 Joe Hunt. This condition is removed after experience by Chaitanya
 			$delivery_line->standard_cost = get_standard_cost($delivery_line->stock_id);
 
 		/* add delivery details for all lines */
 		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
@@ -90,7 +92,7 @@ function write_sales_delivery(&$delivery,$bo_policy)
 			$stock_gl_code = get_stock_gl_code($delivery_line->stock_id);
 
 			/* insert gl_trans to credit stock and debit cost of sales at standard cost*/
-			if ($delivery_line->standard_cost != 0) {
+			if (is_inventory_item($delivery_line->stock_id) && $delivery_line->standard_cost != 0) {
 
 				/*first the cost of sales entry*/
 				// 2008-08-01. If there is a Customer Dimension, then override with this,
@@ -140,11 +142,24 @@ function write_sales_delivery(&$delivery,$bo_policy)
 			$Refs->save(ST_CUSTDELIVERY, $delivery_no, $delivery->reference);
 	}
 
+	hook_db_postwrite($delivery, ST_CUSTDELIVERY);
 	commit_transaction();
 
 	return $delivery_no;
 }
 
+//--------------------------------------------------------------------------------------------------
+function adjust_shipping_charge(&$delivery, $trans_no)
+{
+  	$sql = "SELECT sum(ov_freight) as freight FROM ".TB_PREF."debtor_trans WHERE order_ = $trans_no AND type = " . ST_CUSTDELIVERY . " AND debtor_no = " . $delivery->customer_id;
+  	$result = db_query($sql, "Can not find delivery notes");
+  	$row = db_fetch_row($result);
+  	if (!$row[0]) $freight = 0;
+  	else $freight = $row[0];
+  	if ($freight < $delivery->freight_cost) $delivery->freight_cost = $delivery->freight_cost - $freight;
+  	else $delivery->freight_cost = 0;
+}
+
 //--------------------------------------------------------------------------------------------------
 
 function void_sales_delivery($type, $type_no, $transactions=true)
@@ -152,6 +167,8 @@ function void_sales_delivery($type, $type_no, $transactions=true)
 	if ($transactions)
 		begin_transaction();
 
+	hook_db_prevoid($type, $type_no);
+	
 	void_gl_trans($type, $type_no, true);
 
 	// reverse all the changes in the sales order
@@ -161,10 +178,8 @@ function void_sales_delivery($type, $type_no, $transactions=true)
 
 	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'], $auto);
+			update_parent_line(ST_CUSTDELIVERY, $row['src_id'], -$row['quantity'], $auto);
 		}
 	}