X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_delivery_db.inc;h=3a000103adb4d253361dc2354b79f34e8c737d24;hb=2bcdab793e406bb5a44d2c4e079ec7cc2a1aa857;hp=3f8ffc87dad5e50342e4e3185c11fb762e19f615;hpb=fc449c48a8d4ba23bfb18318dff08746340a440c;p=fa-stable.git

diff --git a/sales/includes/db/sales_delivery_db.inc b/sales/includes/db/sales_delivery_db.inc
index 3f8ffc87..3a000103 100644
--- a/sales/includes/db/sales_delivery_db.inc
+++ b/sales/includes/db/sales_delivery_db.inc
@@ -70,20 +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;
 
 		$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);
 
@@ -101,7 +102,7 @@ function write_sales_delivery(&$delivery,$bo_policy)
 			$mb_flag = get_mb_flag($delivery_line->stock_id);
 
 			if (is_fixed_asset($mb_flag)) {
-				$sql = "UPDATE ".TB_PREF."stock_master SET inactive=1
+				$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");
 			}
@@ -119,31 +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*/
-
-				$delivery_gl_code = $stock_gl_code["cogs_account"];
-				if ($delivery->fixed_asset)
-					$delivery_gl_code = $stock_gl_code["adjustment_account"];
-
-				add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no,
-					$delivery->document_date, $delivery_gl_code, $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"], 0, 0, "",
+						-$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"], 0, 0, "",
+						($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"], 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");
+				}				
 
 			} /* end of if GL and stock integrated and standard cost !=0 */