X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_credit_db.inc;h=94dbe8a235b291a0edd7becd0f4ad331772b0b59;hb=3d8405dc9f78b3141d63c574e53b21ba38e45c10;hp=3a81094490fa06aa7a69d63c89782929739cab72;hpb=fd59c60718609c1bf3240a303030167a4f1b1885;p=fa-stable.git

diff --git a/sales/includes/db/sales_credit_db.inc b/sales/includes/db/sales_credit_db.inc
index 3a810944..94dbe8a2 100644
--- a/sales/includes/db/sales_credit_db.inc
+++ b/sales/includes/db/sales_credit_db.inc
@@ -61,7 +61,7 @@ function write_credit_note($credit_note, $write_off_acc)
 		$credit_note->freight_cost, $freight_added_tax,
 		$credit_note->sales_type,
 		$credit_note->order_no, $credit_invoice, $credit_note->ship_via,
-		null, $alloc, $credit_note->dimension_id, $credit_note->dimension2_id); 
+		null, $alloc, 0, $credit_note->dimension_id, $credit_note->dimension2_id); 
 		// 2008-06-14 extra $alloc, 2008-11-12 dimension_id Joe Hunt
 
 	if ($trans_no==0) {
@@ -208,8 +208,10 @@ function add_gl_trans_credit_costs($order, $order_line, $credit_no, $date_,
 	$customer = get_customer($order->customer_id);
 	// 2008-08-01. If there is a Customer Dimension, then override with this,
 	// else take the Item Dimension (if any)
-	$dim = ($order->dimension_id > 0 ? $order->dimension_id : ($customer['dimension_id'] != 0 ? $customer["dimension_id"] : $stock_gl_codes["dimension_id"]));
-	$dim2 = ($order->dimension2_id > 0 ? $order->dimension2_id : ($customer['dimension2_id'] != 0 ? $customer["dimension2_id"] : $stock_gl_codes["dimension2_id"]));
+	$dim = ($order->dimension_id != $customer['dimension_id'] ? $order->dimension_id : 
+		($customer['dimension_id'] != 0 ? $customer["dimension_id"] : $stock_gl_codes["dimension_id"]));
+	$dim2 = ($order->dimension2_id != $customer['dimension2_id'] ? $order->dimension2_id : 
+		($customer['dimension2_id'] != 0 ? $customer["dimension2_id"] : $stock_gl_codes["dimension2_id"]));
 
 	/* insert gl_trans to credit stock and debit cost of sales at standard cost*/
 	$standard_cost = get_standard_cost($order_line->stock_id);