X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_invoice_db.inc;h=689cd95606873b8833b4fdc9b7d8d39ddeb5ff6e;hb=fd59c60718609c1bf3240a303030167a4f1b1885;hp=d11786356d4d2820942ec0e985515b461da0ae52;hpb=45e45a854c40a7a2f9cc8f11e07a259c6923babd;p=fa-stable.git

diff --git a/sales/includes/db/sales_invoice_db.inc b/sales/includes/db/sales_invoice_db.inc
index d1178635..689cd956 100644
--- a/sales/includes/db/sales_invoice_db.inc
+++ b/sales/includes/db/sales_invoice_db.inc
@@ -61,7 +61,8 @@ function write_sales_invoice(&$invoice)
 		$invoice->Branch, $date_, $invoice->reference, $items_total, 0,
 		$items_added_tax, $invoice->freight_cost, $freight_added_tax,
 		$invoice->sales_type, $sales_order, $delivery_no,
-		$invoice->ship_via, $invoice->due_date, $alloc); // 2008-06-14 extra $alloc
+		$invoice->ship_via, $invoice->due_date, $alloc, $invoice->dimension_id, $invoice->dimension2_id); 
+		// 2008-06-14 extra $alloc, 2008-11-12 added dimension_id Joe Hunt
 
 	if ($trans_no == 0) {
 		$invoice->trans_no = array($invoice_no=>0);
@@ -104,8 +105,8 @@ function write_sales_invoice(&$invoice)
 				$sales_account = ($branch_data['sales_account'] != "" ? $branch_data['sales_account'] : $stock_gl_code['sales_account']);
 				// 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_code["dimension_id"]);
-				$dim2 = ($customer['dimension2_id'] != 0 ? $customer["dimension2_id"] : $stock_gl_code["dimension2_id"]);
+				$dim = ($invoice->dimension_id > 0 ? $invoice->dimension_id : ($customer['dimension_id'] != 0 ? $customer["dimension_id"] : $stock_gl_code["dimension_id"]));
+				$dim2 = ($invoice->dimension2_id > 0 ? $invoice->dimension2_id : ($customer['dimension2_id'] != 0 ? $customer["dimension2_id"] : $stock_gl_code["dimension2_id"]));
 				add_gl_trans_customer(10, $invoice_no, $date_, $sales_account, $dim, $dim2,
 					(-$line_taxfree_price * $invoice_line->qty_dispatched),
 					$invoice->customer_id, "The sales price GL posting could not be inserted");