X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_delivery_db.inc;h=3c260a52c142ee7d5bdb9ca34e7aaae4a6713cb7;hb=947c0dddc6cb94572e1f0cafe6d8c5663c00d695;hp=15b4736d90e49c34a77a611686c6055dea60e22f;hpb=2d01d55a1449c6187b25743f8e08ccf8d79bd713;p=fa-stable.git

diff --git a/sales/includes/db/sales_delivery_db.inc b/sales/includes/db/sales_delivery_db.inc
index 15b4736d..3c260a52 100644
--- a/sales/includes/db/sales_delivery_db.inc
+++ b/sales/includes/db/sales_delivery_db.inc
@@ -68,46 +68,46 @@ function write_sales_delivery(&$delivery,$bo_policy)
 		$branch_data = get_branch_accounts($delivery->Branch);
 		$total = 0;
 	}
-	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*$qty, 0, $delivery->tax_included
-			$delivery->tax_group_array);
+	$delivery->split_line_values();
 
-		$line_tax = get_full_price_for_item(ST_CUSTDELIVERY, $delivery_line->stock_id,
-				$delivery_line->price * $qty, 0, $delivery->tax_included, $delivery->tax_group_array) - $line_taxfree_price
+	foreach ($delivery->line_items as $line_no => $line) {
 
-		$delivery_line->standard_cost = get_unit_cost($delivery_line->stock_id);
+		$qty = $line->qty_dispatched;
+		$line_price = $line->line_price();
+		$line_taxfree_price = $line->gl_amounts['Net'];
+
+		$line_tax = $line->gl_amounts['Tax'];
+
+		$line->unit_cost = get_unit_cost($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(), $qty ? $line_tax/$qty : 0,
-			$delivery_line->discount_percent, $delivery_line->standard_cost, $delivery_line->src_id,
-			$trans_no ? $delivery_line->id : 0);
+		write_customer_trans_detail_item(ST_CUSTDELIVERY, $delivery_no, $line->stock_id,
+			$line->item_description, $line->qty_dispatched,
+			$line->line_price(), $qty ? $line_tax/$qty : 0,
+			$line->discount_percent, $line->unit_cost, $line->src_id,
+			$trans_no ? $line->id : 0);
 
 	// Now update sales_order_details for the quantity delivered
-		if ($delivery_line->qty_old != $delivery_line->qty_dispatched)
-			update_parent_line(ST_CUSTDELIVERY, $delivery_line->src_id,
-				$delivery_line->qty_dispatched-$delivery_line->qty_old);
+		if ($line->qty_old != $line->qty_dispatched)
+			update_parent_line(ST_CUSTDELIVERY, $line->src_id,
+				$line->qty_dispatched-$line->qty_old);
 
-		if ($delivery_line->qty_dispatched != 0) {
-			add_stock_move(ST_CUSTDELIVERY, $delivery_line->stock_id, $delivery_no,
+		if ($line->qty_dispatched != 0) {
+			add_stock_move(ST_CUSTDELIVERY, $line->stock_id, $delivery_no,
 				$delivery->Location, $delivery->document_date, $delivery->reference,
-				-$delivery_line->qty_dispatched, $delivery_line->standard_cost,
-				 $line_price*(1-$delivery_line->discount_percent));
+				-$line->qty_dispatched, $line->unit_cost,
+				 $line_price*(1-$line->discount_percent));
 
-			$mb_flag = get_mb_flag($delivery_line->stock_id);
+			$mb_flag = get_mb_flag($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);
+					WHERE stock_id=".db_escape($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);
+			$stock_gl_code = get_stock_gl_code($line->stock_id);
 
 			// If there is a Customer Dimension, then override with this,
 			// else take the Item Dimension (if any)
@@ -120,49 +120,44 @@ 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->customer_id, "The sales price GL posting could not be inserted");
+					-$line_taxfree_price, $delivery->customer_id);
 			}
 			/* insert gl_trans to credit stock and debit cost of sales at standard cost*/
 			
-			if (is_inventory_item($delivery_line->stock_id)) {
+			if (is_inventory_item($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;
+				    $fa_purchase_cost = get_purchase_cost($line->stock_id);
+					$fa_depreciation = $fa_purchase_cost - $line->unit_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");
+						PT_CUSTOMER, $delivery->customer_id);
 					/*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");
+						PT_CUSTOMER, $delivery->customer_id);
 					/*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");
+						PT_CUSTOMER, $delivery->customer_id);
 				}
 				// Invetory Items
-				else if ($delivery_line->standard_cost != 0) {
+				else if ($line->unit_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");
+						$line->unit_cost * $line->qty_dispatched,
+						PT_CUSTOMER, $delivery->customer_id);
 
 					/*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");
+						(-$line->unit_cost * $line->qty_dispatched),
+						PT_CUSTOMER, $delivery->customer_id);
 				}				
 
 			} /* end of if GL and stock integrated and standard cost !=0 */
@@ -174,7 +169,7 @@ function write_sales_delivery(&$delivery,$bo_policy)
 	{
 		$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");
+			-$total, $delivery->customer_id);
 	}
 
 	if ($bo_policy == 0) {
@@ -188,7 +183,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, null);
+				$taxitem['Net'], $ex_rate, $delivery->document_date, $delivery->reference, null, $delivery->tax_group_id);
 		}
 	}