From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Sun, 5 Sep 2010 09:14:54 +0000 (+0000)
Subject: Wrong stock item code when processing supplier invoice
X-Git-Tag: v2.4.2~19^2~641
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=2d4828ddafa67b5e359681213804ea589ec5a761;p=fa-stable.git

Wrong stock item code when processing supplier invoice
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index da37409b..e034b708 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -23,6 +23,8 @@ $ -> Affected files
 05-Sep-2010 Joe Hunt
 ! Release 2.3 RC
 $ version.php
+# Wrong stock item code when processing supplier invoice
+$ /purchasing/includes/db/invoice_db.inc
 
 04-Sep-2010 Joe Hunt
 # Fixed installed_extensions.php creation
diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc
index 16e25680..860820a1 100644
--- a/purchasing/includes/db/invoice_db.inc
+++ b/purchasing/includes/db/invoice_db.inc
@@ -201,9 +201,8 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b
 		$line_taxfree = $entered_grn->taxfree_charge_price($supp_trans->tax_group_id);
 		$line_tax = $entered_grn->full_charge_price($supp_trans->tax_group_id) - $line_taxfree;
 		$stock_gl_code = get_stock_gl_code($entered_grn->item_code);
-		$iv_act = $supplier_accounts["purchase_account"] ? $supplier_accounts["purchase_account"] :
-			((is_inventory_item($entered_grn->item_code) ? $stock_gl_code["inventory_account"] 
-				: $stock_gl_code["cogs_account"]));
+		$iv_act = (is_inventory_item($entered_grn->item_code) ? $stock_gl_code["inventory_account"] : 
+			($supplier_accounts["purchase_account"] ? $supplier_accounts["purchase_account"] : $stock_gl_code["cogs_account"]));
 		$total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $iv_act,
 			$stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'],
 			$entered_grn->this_quantity_inv * $line_taxfree, $supp_trans->supplier_id);