X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_delivery_db.inc;h=c36e226826c05455799dc9c71beb1ecba735a4e3;hb=9561c66909d960cd75bcbb08bae2132f3de7e6da;hp=ce486a05041fc4cd4ee9308b12e731e5754fec7d;hpb=1fef446949c9d246b6dc5ed48cfe4ff3567f72f9;p=fa-stable.git

diff --git a/sales/includes/db/sales_delivery_db.inc b/sales/includes/db/sales_delivery_db.inc
index ce486a05..c36e2268 100644
--- a/sales/includes/db/sales_delivery_db.inc
+++ b/sales/includes/db/sales_delivery_db.inc
@@ -76,8 +76,8 @@ function write_sales_delivery(&$delivery,$bo_policy)
 			$delivery_line->price*$qty, 0, $delivery->tax_included,
 			$delivery->tax_group_array);
 
-		$line_tax = get_full_price_for_item(ST_CUSTDELIVERY, $delivery_line->stock_id,
-				0, $delivery_line->price * $qty, 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);
 
@@ -137,13 +137,13 @@ function write_sales_delivery(&$delivery,$bo_policy)
 						"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, "",
+						$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"], 0, 0, "",
+						$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");
@@ -159,7 +159,7 @@ function write_sales_delivery(&$delivery,$bo_policy)
 
 					/*now the stock entry*/
 					add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date,
-						$stock_gl_code["inventory_account"], 0, 0, "",
+						$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");
@@ -173,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) {
@@ -209,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;