X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_delivery_db.inc;h=c36e226826c05455799dc9c71beb1ecba735a4e3;hb=cf523b36717768b5c061accc95f3ba9083b88165;hp=9c378f77fb8617d4e17512cde51b046fc51e6ae6;hpb=264c09696d65efe4532c197f317162daf8c24f32;p=fa-stable.git

diff --git a/sales/includes/db/sales_delivery_db.inc b/sales/includes/db/sales_delivery_db.inc
index 9c378f77..c36e2268 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();
 
@@ -51,12 +54,14 @@ function write_sales_delivery(&$delivery,$bo_policy)
 	if ($trans_no == 0) {
 		$delivery->trans_no = array($delivery_no=>0);
 	} else {
+		move_trans_attachments(ST_CUSTDELIVERY, $trans_no, $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);
 	}
 
+
 	// for prepaid delivery repost income from deffered account
 	if ($delivery->is_prepaid())
 	{
@@ -65,21 +70,21 @@ function write_sales_delivery(&$delivery,$bo_policy)
 	}
 	foreach ($delivery->line_items as $line_no => $delivery_line) {
 
+		$qty = $delivery_line->qty_dispatched;
 		$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,
+			$delivery_line->price*$qty, 0, $delivery->tax_included,
 			$delivery->tax_group_array);
 
-		$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;
+		$line_tax = get_full_price_for_item($delivery_line->stock_id,
+				$delivery_line->price * $qty, 0, $delivery->tax_included, $delivery->tax_group_array) - $line_taxfree_price;
 
-		//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);
+		$delivery_line->standard_cost = get_unit_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->line_price(), $qty ? $line_tax/$qty : 0,
 			$delivery_line->discount_percent, $delivery_line->standard_cost, $delivery_line->src_id,
 			$trans_no ? $delivery_line->id : 0);
 
@@ -89,14 +94,22 @@ function write_sales_delivery(&$delivery,$bo_policy)
 				$delivery_line->qty_dispatched-$delivery_line->qty_old);
 
 		if ($delivery_line->qty_dispatched != 0) {
-			add_stock_move_customer(ST_CUSTDELIVERY, $delivery_line->stock_id, $delivery_no,
+			add_stock_move(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);
+				-$delivery_line->qty_dispatched, $delivery_line->standard_cost,
+				 $line_price*(1-$delivery_line->discount_percent));
+
+			$mb_flag = get_mb_flag($delivery_line->stock_id);
+
+			if (is_fixed_asset($mb_flag)) {
+				$sql = "UPDATE ".TB_PREF."stock_master SET inactive=1, material_cost=0
+					WHERE stock_id=".db_escape($delivery_line->stock_id);
+				db_query($sql,"The cost details for the fixed asset could not be updated");
+			}
 
 			$stock_gl_code = get_stock_gl_code($delivery_line->stock_id);
 
-			// 2008-08-01. If there is a Customer Dimension, then override with this,
+			// 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"]));
@@ -107,27 +120,50 @@ function write_sales_delivery(&$delivery,$bo_policy)
 				$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");
+					-$line_taxfree_price, $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*/
-
-				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*/
-
-				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,
-					"The stock side of the cost of sales GL posting could not be inserted");
+			
+			if (is_inventory_item($delivery_line->stock_id)) {
+				// Fixed Assets
+				if ($delivery->fixed_asset) {
+				    $fa_purchase_cost = get_purchase_cost($delivery_line->stock_id);
+					$fa_depreciation = $fa_purchase_cost - $delivery_line->standard_cost;
+					/*first remove depreciation*/
+					add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no,
+						$delivery->document_date, $stock_gl_code["adjustment_account"], $dim, $dim2, "",
+						$fa_depreciation,
+						PT_CUSTOMER, $delivery->customer_id,
+						"The cost of sales GL posting could not be inserted");
+					/*then remove asset*/
+					add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date,
+						$stock_gl_code["inventory_account"], $dim, $dim2, "",
+						-$fa_purchase_cost,
+						PT_CUSTOMER, $delivery->customer_id,
+						"The stock side of the cost of sales GL posting could not be inserted");
+					/*finally adjust sales account with the remaining*/
+					add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date,
+						$stock_gl_code["cogs_account"], $dim, $dim2, "",
+						($fa_purchase_cost - $fa_depreciation),
+						PT_CUSTOMER, $delivery->customer_id,
+						"The stock side of the cost of sales GL posting could not be inserted");
+				}
+				// Invetory Items
+				else if ($delivery_line->standard_cost != 0) {
+					/*first the cost of sales entry*/
+					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*/
+					add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date,
+						$stock_gl_code["inventory_account"], $dim, $dim2, "",
+						(-$delivery_line->standard_cost * $delivery_line->qty_dispatched),
+						PT_CUSTOMER, $delivery->customer_id,
+						"The stock side of the cost of sales GL posting could not be inserted");
+				}				
 
 			} /* end of if GL and stock integrated and standard cost !=0 */
 
@@ -137,8 +173,9 @@ function write_sales_delivery(&$delivery,$bo_policy)
 	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");
+		add_gl_trans(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date, $deferred_act, 0, 0, 
+			"The deferred income GL posting could not be inserted",
+			-$total, null, PT_CUSTOMER, $delivery->customer_id);
 	}
 
 	if ($bo_policy == 0) {
@@ -152,7 +189,7 @@ function write_sales_delivery(&$delivery,$bo_policy)
 				$ex_rate = get_exchange_rate_from_home_currency(get_customer_currency($delivery->customer_id), $delivery->document_date);
     		    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 );
+				$taxitem['Net'], $ex_rate, $delivery->document_date, $delivery->reference, null);
 		}
 	}
 
@@ -161,8 +198,6 @@ 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();
 
@@ -175,7 +210,7 @@ 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;
+  	if (!is_array($row)) $freight = 0;
   	else $freight = $row[0];
   	if ($freight < $delivery->freight_cost) $delivery->freight_cost = $delivery->freight_cost - $freight;
   	else $delivery->freight_cost = 0;
@@ -218,4 +253,4 @@ function void_sales_delivery($type, $type_no, $transactions=true)
 	if ($transactions)
 		commit_transaction();
 }
-?>
\ No newline at end of file
+