$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) {
$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);