X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_credit_db.inc;h=171c0a7e86a78711039b5c73443d8237966a8998;hb=f01cb25258d7b619f820d8f78e9bccf4501fc58e;hp=0c15b4b7cb469d2068c2a6534b053e71fc71c2d0;hpb=95ff74b5722826544743a01daf527aa3c9efe11a;p=fa-stable.git

diff --git a/sales/includes/db/sales_credit_db.inc b/sales/includes/db/sales_credit_db.inc
index 0c15b4b7..171c0a7e 100644
--- a/sales/includes/db/sales_credit_db.inc
+++ b/sales/includes/db/sales_credit_db.inc
@@ -114,6 +114,8 @@ function write_credit_note(&$credit_note, $write_off_acc)
 		$line_tax = get_full_price_for_item($credit_line->stock_id, $credit_line->price,
 		  0, $credit_note->tax_included, $credit_note->tax_group_array) - $line_taxfree_price;
 
+		$credit_line->standard_cost = get_unit_cost($credit_line->stock_id); 
+		
 		write_customer_trans_detail_item(ST_CUSTCREDIT, $credit_no, $credit_line->stock_id,
 			$credit_line->item_description, $credit_line->qty_dispatched,
 			$credit_line->line_price(), $line_tax, $credit_line->discount_percent,
@@ -209,7 +211,8 @@ function add_gl_trans_credit_costs($order, $order_line, $credit_no, $date_,
 	$total = 0;
 	/* insert gl_trans to credit stock and debit cost of sales at standard cost*/
 	$unit_cost = get_unit_cost($order_line->stock_id);
-	if ($unit_cost != 0) {
+
+	if ($stock_gl_codes['mb_flag'] != 'D' && $unit_cost != 0) {
 		/*first the cost of sales entry*/
 
 		$total += add_gl_trans_std_cost(ST_CUSTCREDIT, $credit_no, $date_, $stock_gl_codes["cogs_account"],