X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_delivery_db.inc;h=b6f4bd0e0f7f5c8fe5f3106fe7ff284b92487f63;hb=d92fb975635e81ed5bc61e0d27318511d36bf0be;hp=72392077b4e619f0a2f4e2ab7b84626dfdf1b7ce;hpb=1572a0afcb671ad77631ce956547c31f96773fe4;p=fa-stable.git

diff --git a/sales/includes/db/sales_delivery_db.inc b/sales/includes/db/sales_delivery_db.inc
index 72392077..b6f4bd0e 100644
--- a/sales/includes/db/sales_delivery_db.inc
+++ b/sales/includes/db/sales_delivery_db.inc
@@ -24,6 +24,9 @@ function write_sales_delivery(&$delivery,$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();
 
@@ -46,7 +49,7 @@ function write_sales_delivery(&$delivery,$bo_policy)
 		$delivery->tax_included ? 0 : $freight_tax,
 		$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, $delivery->prep_amount);
 
 	if ($trans_no == 0) {
 		$delivery->trans_no = array($delivery_no=>0);
@@ -57,6 +60,12 @@ function write_sales_delivery(&$delivery,$bo_policy)
 		delete_comments(ST_CUSTDELIVERY, $delivery_no);
 	}
 
+	// for prepaid delivery repost income from deffered account
+	if ($delivery->is_prepaid())
+	{
+		$branch_data = get_branch_accounts($delivery->Branch);
+		$total = 0;
+	}
 	foreach ($delivery->line_items as $line_no => $delivery_line) {
 
 		$line_price = $delivery_line->line_price();
@@ -88,19 +97,26 @@ function write_sales_delivery(&$delivery,$bo_policy)
 				-$delivery_line->qty_dispatched, $delivery_line->standard_cost,1,
 				$line_price, $delivery_line->discount_percent);
 
-
 			$stock_gl_code = get_stock_gl_code($delivery_line->stock_id);
 
+			// 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"]));
+			if ($delivery->is_prepaid())
+			{
+				$sales_account = ($branch_data['sales_account'] != "" ? $branch_data['sales_account'] : $stock_gl_code['sales_account']);
+
+				$total += add_gl_trans_customer(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date, $sales_account, $dim, $dim2,
+					-$line_taxfree_price*$delivery_line->qty_dispatched, // FIXME - calculation order should be exactly like in invoice to minimalize roundings
+					$delivery->customer_id, "The sales price GL posting could not be inserted");
+			}
 			/* insert gl_trans to credit stock and debit cost of sales at standard cost*/
 			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,
-				// 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(ST_CUSTDELIVERY, $delivery_no,
 					$delivery->document_date, $stock_gl_code["cogs_account"], $dim, $dim2, "",
@@ -121,6 +137,13 @@ function write_sales_delivery(&$delivery,$bo_policy)
 		} /*quantity dispatched is more than 0 */
 	} /*end of order_line loop */
 
+	if ($delivery->is_prepaid())
+	{
+		$deferred_act = get_company_pref('deferred_income_act');
+		add_gl_trans_customer(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date, $deferred_act, 0, 0,
+			-$total, $delivery->customer_id, "The deferred income GL posting could not be inserted");
+	}
+
 	if ($bo_policy == 0) {
 		// if cancelling any remaining quantities
 		close_sales_order($delivery->order_no);
@@ -141,13 +164,26 @@ function write_sales_delivery(&$delivery,$bo_policy)
 	if ($trans_no == 0) {
 			$Refs->save(ST_CUSTDELIVERY, $delivery_no, $delivery->reference);
 	}
-
+//_vd(get_gl(ST_CUSTDELIVERY, $delivery_no));
+//exit;
 	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)
@@ -185,4 +221,3 @@ function void_sales_delivery($type, $type_no, $transactions=true)
 	if ($transactions)
 		commit_transaction();
 }
-?>
\ No newline at end of file