X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_credit_db.inc;h=ed22cba2bec1d56cea3332349c3b1202e421209d;hb=72c7510d29d26a0ede9cc23ad052b0ed156b1aaf;hp=2f56e9012d03548015ab02a7fffdb17aa5da7351;hpb=f12dbe7523bb1abc6cd69b009ef8f0be838f5348;p=fa-stable.git

diff --git a/sales/includes/db/sales_credit_db.inc b/sales/includes/db/sales_credit_db.inc
index 2f56e901..ed22cba2 100644
--- a/sales/includes/db/sales_credit_db.inc
+++ b/sales/includes/db/sales_credit_db.inc
@@ -61,7 +61,8 @@ 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); // 2008-06-14 extra $alloc
+		null, $alloc, $credit_note->dimension_id, $credit_note->dimension2_id); 
+		// 2008-06-14 extra $alloc, 2008-11-12 dimension_id Joe Hunt
 
 	if ($trans_no==0) {
 		$credit_note->trans_no = array($credit_no=>0);
@@ -207,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 = ($customer['dimension_id'] != 0 ? $customer["dimension_id"] : $stock_gl_codes["dimension_id"]);
-	$dim2 = ($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);