X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_delivery_db.inc;h=90ef315e83b4b0330950f66c39ce0afc7847365f;hb=8d564a2cbca92c71738d933813ac4985e15488e4;hp=8bd2d785a3750c6a8836cc8172e4c8d1b5d3a3c8;hpb=ebc600101ceab69c06eac4b1bd4d1782af45de05;p=fa-stable.git

diff --git a/sales/includes/db/sales_delivery_db.inc b/sales/includes/db/sales_delivery_db.inc
index 8bd2d785..90ef315e 100644
--- a/sales/includes/db/sales_delivery_db.inc
+++ b/sales/includes/db/sales_delivery_db.inc
@@ -20,8 +20,13 @@ 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);
+
+	add_new_exchange_rate($customer['curr_code'], $delivery->document_date, $delivery->ex_rate);
+
 	$delivery_items_total = $delivery->get_items_total_dispatch();
 	$freight_tax = $delivery->get_shipping_tax();
 
@@ -42,8 +47,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 +60,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,
@@ -63,14 +70,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
@@ -88,7 +95,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,
@@ -105,7 +112,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, "",
@@ -139,17 +145,33 @@ 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)
+//--------------------------------------------------------------------------------------------------
+
+function void_sales_delivery($type, $type_no, $transactions=true)
 {
-	begin_transaction();
+	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
@@ -158,10 +180,9 @@ function void_sales_delivery($type, $type_no)
 	$order = get_customer_trans_order($type, $type_no);
 
 	if ($order) {
-		$order_items = get_sales_order_details($order, ST_SALESORDER);
+		$auto = (get_reference(ST_SALESORDER, $order) == "auto");
 		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, $row['src_id'], -$row['quantity'], $auto);
 		}
 	}
 
@@ -176,6 +197,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